From 931a8f9593f0d35eaa2d3a87a875de30296c0dc1 Mon Sep 17 00:00:00 2001 From: TS-QD1 Date: Tue, 7 Mar 2023 14:29:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E4=B8=93=E7=AE=A1?= =?UTF-8?q?=E5=91=98=E5=8C=BA=E5=9F=9F=20=E6=9D=A1=E4=BB=B6=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E2=80=9C=E7=BD=91=E6=A0=BC=E5=91=98=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E2=80=9D=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ReportCaseServiceImpl.java | 3 +- .../mybatis/mapper/grid/grid-mapper.xml | 14 +- .../mapper/reportcase/reportcase-mapper.xml | 240 ++++++++++++++---- .../static/route/assessment/list_day.html | 1 + .../static/route/assessment/list_history.html | 2 +- .../route/reportcase/case-statistic.html | 22 +- .../static/route/usersignin/list.html | 1 + .../static/route/usersignout/list.html | 1 + 8 files changed, 224 insertions(+), 60 deletions(-) diff --git a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java index 4cf84be..2bb8a27 100755 --- a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java @@ -319,7 +319,7 @@ public class ReportCaseServiceImpl extends BaseService implements IReportCaseSer /** * 设置专管员区域参数 * - * @param areaId + * @param params */ private void setNPersonAreaParams(Map params) { Object areaIdObj = params.get("areaId"); @@ -1150,7 +1150,6 @@ public class ReportCaseServiceImpl extends BaseService implements IReportCaseSer if (areaIdObj == null || StringUtils.isBlank(areaIdObj.toString()) || StringUtils.equals(ISystemCityConsts.N_PERSON_AREA_ID, areaIdObj.toString())) { // 列出所有的专管机构 - params.put("departmentParentId", "0"); List handleDepartmentDTOS = reportCaseDao.listDept(params); for (int i = 0; i < handleDepartmentDTOS.size(); i++) { diff --git a/src/main/resources/mybatis/mapper/grid/grid-mapper.xml b/src/main/resources/mybatis/mapper/grid/grid-mapper.xml index 2818cb4..f0c4be0 100644 --- a/src/main/resources/mybatis/mapper/grid/grid-mapper.xml +++ b/src/main/resources/mybatis/mapper/grid/grid-mapper.xml @@ -298,7 +298,19 @@ relation_id = #{excludeRelationId} ) - GROUP BY t1.grid_id + GROUP BY + t1.grid_id, + t1.grid_name, + t1.grid_summary, + t1.grid_group_id, + t1.grid_duty, + t1.grid_code, + t1.grid_square, + t1.area_code, + t1.area_name, + t1.fill_color, + t1.gmt_create, + t1.gmt_modified diff --git a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml index 54496de..71eac0e 100755 --- a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml +++ b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml @@ -157,16 +157,34 @@ AND LEFT(t1.gmt_create, 10) #{endTime} + + + + + + + + + + + + AND - t1.creator IN ( + t1.report_case_id IN ( SELECT - user_id + st1.case_id FROM - sys_role_user + city_report_case_assign st1 WHERE - - role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' + st1.is_delete = 0 + AND + st1.handle_user_id IN ( + SELECT + sst1.user_id + FROM + sys_department_user sst1 + ) ) ORDER BY t1.gmt_modified DESC @@ -422,17 +440,42 @@ ) + + + + + + + + + + + + + - AND - t1.creator IN ( - SELECT - user_id - FROM - sys_role_user - WHERE - - role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' - ) + 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 + INNER JOIN + sys_role_user sst2 + ON + sst1.user_id = sst2.user_id + AND + sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' + ) + ) AND @@ -792,16 +835,41 @@ + + + + + + + + + + + + + - AND - t1.creator IN ( - SELECT - user_id - FROM - sys_role_user - WHERE - - role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' + 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 + INNER JOIN + sys_role_user sst2 + ON + sst1.user_id = sst2.user_id + AND + sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' + ) ) ORDER BY @@ -885,16 +953,41 @@ + + + + + + + + + + + + + - AND - t1.creator IN ( + AND + t1.report_case_id IN ( SELECT - user_id + st1.case_id FROM - sys_role_user + city_report_case_assign st1 WHERE - - role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' + st1.is_delete = 0 + AND + st1.handle_user_id IN ( + SELECT + sst1.user_id + FROM + sys_department_user sst1 + INNER JOIN + sys_role_user sst2 + ON + sst1.user_id = sst2.user_id + AND + sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' + ) ) ORDER BY t1.gmt_modified DESC @@ -1050,17 +1143,42 @@ + + + + + + + + + + + + + - AND - t1.creator IN ( - SELECT - user_id - FROM - sys_role_user + AND + t1.report_case_id IN ( + SELECT + st1.case_id + FROM + city_report_case_assign st1 WHERE - - role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' - ) + st1.is_delete = 0 + AND + st1.handle_user_id IN ( + SELECT + sst1.user_id + FROM + sys_department_user sst1 + INNER JOIN + sys_role_user sst2 + ON + sst1.user_id = sst2.user_id + AND + sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' + ) + ) ORDER BY t1.gmt_modified DESC @@ -1256,16 +1374,41 @@ + + + + + + + + + + + + + AND - t1.creator IN ( + t1.report_case_id IN ( SELECT - user_id + st1.case_id FROM - sys_role_user + city_report_case_assign st1 WHERE - - role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' + st1.is_delete = 0 + AND + st1.handle_user_id IN ( + SELECT + sst1.user_id + FROM + sys_department_user sst1 + INNER JOIN + sys_role_user sst2 + ON + sst1.user_id = sst2.user_id + AND + sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' + ) ) ORDER BY @@ -1535,7 +1678,7 @@ AND gmt_create #{endTime} - AND + AND ( report_case_id IN ( SELECT st1.case_id @@ -1549,9 +1692,16 @@ sst1.user_id FROM sys_department_user sst1 + INNER JOIN + sys_role_user sst2 + ON + sst1.user_id = sst2.user_id + AND + sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' WHERE sst1.department_id = #{handleDepartmentId} ) + ) ) diff --git a/src/main/resources/static/route/assessment/list_day.html b/src/main/resources/static/route/assessment/list_day.html index 988ec82..6d043a7 100755 --- a/src/main/resources/static/route/assessment/list_day.html +++ b/src/main/resources/static/route/assessment/list_day.html @@ -28,6 +28,7 @@ diff --git a/src/main/resources/static/route/assessment/list_history.html b/src/main/resources/static/route/assessment/list_history.html index 2b080a9..d6849c0 100755 --- a/src/main/resources/static/route/assessment/list_history.html +++ b/src/main/resources/static/route/assessment/list_history.html @@ -22,6 +22,7 @@ @@ -140,7 +141,6 @@ //初始化社区 function initCommunity(areaId) { top.restAjax.get('api/community/listcommunity?areaId=' + areaId, {}, null, function(code, data) { - console.log(data); laytpl(document.getElementById('communitySelectTemplate').innerHTML).render(data, function(html) { document.getElementById('communitySelectTemplateBox').innerHTML = html; }); diff --git a/src/main/resources/static/route/reportcase/case-statistic.html b/src/main/resources/static/route/reportcase/case-statistic.html index 43f5eac..e98f43b 100644 --- a/src/main/resources/static/route/reportcase/case-statistic.html +++ b/src/main/resources/static/route/reportcase/case-statistic.html @@ -27,15 +27,15 @@ {{# } }} -
- + + + + + + + + +