修改上报逻辑等

src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseAutoAppServiceImpl.java

@@ -47,7 +47,7 @@ public class ReportCaseAutoAppServiceImpl extends BaseService implements IReport
         params.put("caseReporter", appToken.getAppTokenUser().getName());
         setSaveInfo(token, params);
         //2020-12-22 添加案件分类wans
-        // caseFlowType 1 职能部门案件 2 街镇案件 3 其他类型案件
+        // caseFlowType 1 职能部门案件 2 街镇案件
         // caseFlowForward 转发状态 0未转发 1转发 2回退
         String caseFlowType = StringUtils.isEmpty(params.get("caseFlowType"))? "" : params.get("caseFlowType").toString();
         params.put("caseFlowType",caseFlowType);

src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java

@@ -227,8 +227,6 @@ public class ReportCaseServiceImpl extends BaseService implements IReportCaseSer
             page.getParams().put("reporterId", appTokenUser.getId());
         }
         PageHelper.startPage(page.getPage(), page.getRows());
-        //标记只查询只能部门案件
-        page.getParams().put("caseFlowType", "normal");
         List<ReportCaseDTO> reportCaseDTOs = reportCaseDao.listReportCase(page.getParams());
         PageInfo<ReportCaseDTO> pageInfo = new PageInfo<>(reportCaseDTOs);
         return new SuccessResultList<>(reportCaseDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
@@ -482,6 +480,17 @@ public class ReportCaseServiceImpl extends BaseService implements IReportCaseSer
         LOG.debug("新增案件下派信息");
         params.put("isHandle", 0);
         params.put("assignUserName", securityComponent.getCurrentUser().getUserName());
+        /**
+         * 2021-07-04 wangshuai
+         * 因handle_user_id为communitybossid
+         * 现在需要修改为user_id
+         */
+        String handleUserId = params.get("handleUserId").toString();
+        Map<String, Object> queryMap = getHashMap(8);
+        queryMap.put("communityBossId",handleUserId);
+        CommunityBossDTO communityBoss = communityBossService.getCommunityBoss(queryMap);
+        params.put("handleUserId", communityBoss.getCommunityBossUserId());
+        params.put("handleUserName", communityBoss.getCommunityBossName());
         setSaveInfo(params);
         reportCaseDao.saveReportCaseAssign(params);
 

src/main/resources/application-test.yml

@@ -1,6 +1,6 @@
 server:
   port: 8083
-  url: http://127.0.0.1:8083/servicecity
+  url: http://192.168.0.109:8083/servicecity
   title: 稀土高新区社会治理综合管理平台
   servlet:
     context-path: /servicecity
@@ -25,13 +25,13 @@ spring:
   datasource:
     druid:
 #      url: jdbc:mysql://49.233.36.36:6688/db_cloud_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
-      url: jdbc:mysql://127.0.0.1:3306/db_cloud_v2_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+      url: jdbc:mysql://127.0.0.1:3306/db_cloud_servicecity?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
       db-type: mysql
       driver-class-name: com.mysql.jdbc.Driver
 #      username: wanggeng
       username: root
 #      password: WenG>2132997
-      password: root
+      password: 123456
       initial-size: 2
       min-idle: 2
       max-active: 10
@@ -73,7 +73,7 @@ swagger:
 
 # 文件
 file:
-  uploadPath: C:\Users\wenc0\Desktop\UploadFiles\
+  uploadPath: D:\ideaWorkspace\uploadfiles\pianzhang
   imageTypes: png,jpg,jpeg,gif,blob
   videoTypes: mp4,rmvb
   audioTypes: mp3,wmv,wav
@@ -82,7 +82,7 @@ file:
 # 安全
 security:
   oauth2:
-    oauth-server: http://127.0.0.1:7001/usercenter
+    oauth-server: http://219.147.99.164:8082/usercenter
     oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
     client:
       client-id: c024a89b35b04d4d8b5b4ea4d66a8acb
@@ -99,7 +99,7 @@ security:
       check-token-access: ${security.oauth2.oauth-server}/oauth_client/token_key
 
 api-path:
-  user-center: http://127.0.0.1:7001/usercenter
+  user-center: http://219.147.99.164:8082/usercenter
 
 # 访问控制
 access-control:
@@ -134,6 +134,7 @@ access-control:
 
 # 日志
 logging:
+  file: D:\ideaWorkspace\logs\pianzhang\pianzhang-logs.log
   level:
     root: error
     com.cm: debug

src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml

@@ -324,7 +324,7 @@
         </if>
         <!-- 查询镇街案件 -->
         <if test="caseFlowType == 'other'">
-            AND (t1.case_flow_type = '2' OR t1.case_flow_type = '3')
+            AND (t1.case_flow_type = '2')
             AND (t1.case_flow_forward = '0' OR t1.case_flow_forward = '2')
         </if>
         ORDER BY t1.gmt_create DESC
@@ -1224,31 +1224,16 @@
             t3.handle_opinion,
             t3.handle_photos,
             LEFT(t3.gmt_create, 19) handle_date
-        FROM
+        FROM city_report_case t1
-            city_report_case t1
+        LEFT JOIN city_report_case_assign t2 ON t1.report_case_id = t2.case_id AND t2.is_delete = 0
-        LEFT JOIN
+        LEFT JOIN city_report_case_handle t3 ON t1.report_case_id = t3.case_id AND t3.is_delete = 0
-            city_report_case_assign t2
-        ON
-            t1.report_case_id = t2.case_id
-        AND
-            t2.is_delete = 0
-        LEFT JOIN
-            city_report_case_handle t3
-        ON
-            t1.report_case_id = t3.case_id
-        AND
-            t3.is_delete = 0
         WHERE
             t1.is_delete = 0
         AND (
             (
-                t1.case_status = 3
+                t1.case_status = 3 AND t2.handle_user_id = #{userId}
-                AND
-                t2.handle_user_id = #{userId}
             ) OR (
-                t1.case_status = 4
+                t1.case_status = 4 AND t1.creator = #{userId}
-                AND
-                t1.creator = #{userId}
             )
         )
         ORDER BY

src/main/resources/static/route/specialreportcase/list_place_on_file.html

@@ -364,7 +364,7 @@
                     area: ['1200px', '700px'],
                     shadeClose: true,
                     anim: 2,
-                    content: top.restAjax.path('route/specialReportcase/show.html?reportCaseId={id}',
+                    content: top.restAjax.path('route/specialreportcase/show.html?reportCaseId={id}',
                         [obj.data.reportCaseId]),
                     end: function() {
                     }

src/test/java/com/cm/systemcity/SystemCityApplicationTests.java

@@ -24,7 +24,7 @@ public class SystemCityApplicationTests {
     @Test
     public void importCommunityBoss() throws SQLException, ClassNotFoundException {
         Class.forName("com.mysql.jdbc.Driver");
-        Connection connection = DriverManager.getConnection("jdbc:mysql://127.0.0.1:3306/db_cloud_v2_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false", "root", "root");
+        Connection connection = DriverManager.getConnection("jdbc:mysql://127.0.0.1:3306/db_cloud_servicecity?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false", "root", "123456");
         // 所有用户
         String sql = "SELECT * FROM sys_user WHERE is_delete = '0'";
         PreparedStatement preparedStatement = connection.prepareStatement(sql);
@@ -46,11 +46,9 @@ public class SystemCityApplicationTests {
         List<CommunityBossExcel> noLeaderUsernameList = new ArrayList<>();
         List<CommunityBossExcel> noAreaList = new ArrayList<>();
         List<CommunityBossExcel> noCommunityList = new ArrayList<>();
-        String wsqExcel = "H:\\工作资料\\项目\\文档资料\\包头-网格长制城市管理服务平台\\2期\\网格信息（新）\\万水泉镇网格员模板1(2)(1).xlsx";
+        String wsqExcel = "D:\\腾狮科技\\城市综合治理操作视频\\1.xlsx";
-        String xtlExcel = "H:\\工作资料\\项目\\文档资料\\包头-网格长制城市管理服务平台\\2期\\网格信息（新）\\网格划分信息（稀土路街道)(1)(3)(1).xlsx";
+        String xtlExcel = "D:\\腾狮科技\\城市综合治理操作视频\\2.xlsx";
-        String mxExcel = "H:\\工作资料\\项目\\文档资料\\包头-网格长制城市管理服务平台\\2期\\网格信息（新）\\网格划分信息6.16（民馨路街道).xlsx";
+        EasyExcel.read(new File(xtlExcel), CommunityBossExcel.class, new CommunityBossExcelListener() {
-        String allExcel = "H:\\工作资料\\项目\\文档资料\\包头-网格长制城市管理服务平台\\2期\\网格信息（新）\\全部网格员.xlsx";
-        EasyExcel.read(new File(allExcel), CommunityBossExcel.class, new CommunityBossExcelListener() {
             @Override
             public void listExcel(List<CommunityBossExcel> communityBossExcels) throws Exception {
                 for (CommunityBossExcel communityBossExcel : communityBossExcels) {
@@ -216,7 +214,7 @@ public class SystemCityApplicationTests {
                     }
                 }
             }
-        }).headRowNumber(2).sheet(0).doRead();
+        }).headRowNumber(1).sheet(0).doRead();
         System.out.println("无用户名网格长");
         noUsernameList.forEach(System.out::println);
         System.out.println("无领导用户名网格长");