diff --git a/src/main/resources/application-btgxq.yml b/src/main/resources/application-btgxq.yml
index 361e8e8..47c5255 100644
--- a/src/main/resources/application-btgxq.yml
+++ b/src/main/resources/application-btgxq.yml
@@ -1,6 +1,6 @@
server:
port: 7022
- url: http://192.168.0.15:7022/servicecity
+ url: http://127.0.0.1:7022/servicecity
title: 生态环保网格化监督平台
servlet:
context-path: /servicecity
@@ -24,7 +24,7 @@ spring:
max-request-size: 1GB
datasource:
druid:
- url: jdbc:mysql://192.168.0.151:3306/db_btgxq_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/db_btgxq_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
db-type: mysql
driver-class-name: com.mysql.jdbc.Driver
username: root
@@ -55,7 +55,7 @@ spring:
config: classpath:ehcache.xml
data:
mongodb:
- uri: mongodb://city:city@192.168.0.156:27017/systemcity
+ uri: mongodb://city:city@127.0.0.1:27017/systemcity
# 数据库
mybatis:
@@ -81,7 +81,7 @@ file:
# 安全
security:
oauth2:
- oauth-server: http://192.168.0.15:7021/usercenter
+ oauth-server: http://127.0.0.1:7021/usercenter
oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
client:
client-id: c024a89b35b04d4d8b5b4ea4d66a8acb
diff --git a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
index b1bc7d9..2751db5 100755
--- a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
+++ b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml
@@ -32,6 +32,7 @@
+
@@ -133,9 +134,19 @@
t1.case_reporter,
t1.creator,
LEFT(t1.gmt_create, 19) gmt_create,
- LEFT(t1.gmt_modified, 19) gmt_modified
+ LEFT(t1.gmt_modified, 19) gmt_modified,
+ t2.handle_user_name,
+ t3.user_username handle_user_username
FROM
city_report_case t1
+ LEFT JOIN
+ city_report_case_handle t2
+ ON
+ t1.report_case_id = t2.case_id
+ LEFT JOIN
+ sys_user t3
+ ON
+ t2.creator = t3.user_id
WHERE
t1.is_delete = 1
@@ -148,7 +159,19 @@
AND t1.community_id = #{communityId}
- AND t1.case_type_id = #{caseTypeId}
+ AND t1.case_type_id IN (
+ SELECT
+ cd.dict_id
+ FROM
+ city_dict cd
+ WHERE
+ cd.is_delete = 0
+ AND (
+ dict_id = #{caseTypeId}
+ OR
+ dict_parent_id = #{caseTypeId}
+ )
+ )
AND t1.case_status = #{caseStatus}
@@ -193,6 +216,26 @@
)
)
+
+ AND
+ t1.report_case_id IN (
+ SELECT
+ st1.case_id
+ FROM
+ city_report_case_assign st1
+ WHERE
+ st1.is_delete = 0
+ AND
+ st1.handle_user_id IN (
+ SELECT
+ sst1.user_id
+ FROM
+ sys_department_user sst1
+ WHERE
+ sst1.department_id = #{departmentId}
+ )
+ )
+
ORDER BY t1.gmt_modified DESC
@@ -1783,8 +1826,20 @@
AND t1.community_id = #{communityId}
-
- AND t1.case_type_id = #{caseTypeId}
+
+ AND t1.case_type_id IN (
+ SELECT
+ cd.dict_id
+ FROM
+ city_dict cd
+ WHERE
+ cd.is_delete = 0
+ AND (
+ dict_id = #{caseTypeId}
+ OR
+ dict_parent_id = #{caseTypeId}
+ )
+ )
AND t1.gmt_create = ]]> #{startTime}
diff --git a/src/main/resources/static/assets/layuiadmin/modules/selecttree.js b/src/main/resources/static/assets/layuiadmin/modules/selecttree.js
new file mode 100644
index 0000000..43e418a
--- /dev/null
+++ b/src/main/resources/static/assets/layuiadmin/modules/selecttree.js
@@ -0,0 +1,82 @@
+layui.define(['ztree'], function(exports){
+ let $ = layui.$;
+
+ function dept(opt) {
+ let elem = $(opt.elem);
+ let name = opt.name;
+ let treeContainer = `${name}TreeContainer`;
+ let treeName = `${name}ZTree`;
+ let selectName = `${name}Name`;
+ let selectId = `${name}Id`;
+ let deleteBtn = `${name}DeleteBtn`;
+ let ztree;
+
+ let init = function() {
+ elem.css({
+ position: 'relative'
+ })
+ elem.append(`
+
+
+
+
+ `);
+ }
+
+ let renderTree = function () {
+ var setting = {
+ async: {
+ enable: true,
+ autoLoad: true,
+ type: 'get',
+ url: top.restAjax.path('api/department/listztreedepartment', []),
+ autoParam: ['id'],
+ otherParam: {},
+ dataFilter: function (treeId, parentNode, childNodes) {
+ if (!childNodes) return null;
+ for (var i = 0, l = childNodes.length; i < l; i++) {
+ childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+ }
+ return childNodes;
+ }
+ },
+ callback: {
+ onClick: function (event, treeId, treeNode) {
+ $(`#${selectName}`).val(treeNode.name);
+ $(`#${selectId}`).val(treeNode.id);
+ return false;
+ }
+ },
+ };
+ var zTree = $.fn.zTree.init($(`#${treeName}`), setting);
+ }
+
+ let addEvent = function() {
+ $(`#${deleteBtn}`).click(function() {
+ $(`#${selectName}`).val('');
+ $(`#${selectId}`).val('');
+ });
+ $(document).on('click', `#${selectName}`, function(e) {
+ $(`#${treeContainer}`).show();
+ e.stopPropagation();
+ })
+
+ $(document).on('click', `:not(#${selectName})`, function(e) {
+ console.log(2)
+ $(`#${treeContainer}`).hide();
+ e.stopPropagation();
+ })
+ }
+
+ init();
+ renderTree();
+ addEvent();
+
+ }
+
+ exports('selecttree', {
+ dept: dept
+ })
+})
\ No newline at end of file
diff --git a/src/main/resources/static/route/reportcase/case-statistic.html b/src/main/resources/static/route/reportcase/case-statistic.html
index e98f43b..f35f294 100644
--- a/src/main/resources/static/route/reportcase/case-statistic.html
+++ b/src/main/resources/static/route/reportcase/case-statistic.html
@@ -9,6 +9,7 @@
+
@@ -80,7 +81,7 @@
base: 'assets/layuiadmin/'
}).extend({
index: 'lib/index'
- }).use(['index', 'table', 'laytpl', 'form','laydate'], function() {
+ }).use(['index', 'table', 'laytpl', 'form','laydate', 'selecttree'], function() {
var $ = layui.$;
var $win = $(window);
var laytpl = layui.laytpl;
@@ -88,6 +89,7 @@
var admin = layui.admin;
var form = layui.form;
var laydate = layui.laydate;
+ var selecttree = layui.selecttree;
var tableUrl = 'api/reportcase/listcasestatisticratio';
var dataLoading = false;
@@ -205,7 +207,7 @@
dataLoading = true;
var caseTypeId = $('#caseTypeId').val();
var childCaseTypeId = $('#childCaseTypeId').val();
- if(childCaseTypeId != ''){
+ if(childCaseTypeId) {
caseTypeId = childCaseTypeId;
}
table.reload('dataTable', {
diff --git a/src/main/resources/static/route/reportcase/list_disputed.html b/src/main/resources/static/route/reportcase/list_disputed.html
index 3396129..13d9981 100644
--- a/src/main/resources/static/route/reportcase/list_disputed.html
+++ b/src/main/resources/static/route/reportcase/list_disputed.html
@@ -13,6 +13,7 @@
+