先统一提交下

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java

@@ -32,11 +32,11 @@ public class IdCardCryptoUtil {
         String key = "VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0";
         System.out.println("====================== 示例 ======================");
         // 加密
-        String source_dec = "13101318327";
+        String source_dec = "13009650312";
         String enc = IdCardCryptoUtil.symmetricEncryptIdCard(key, source_dec);
         System.out.println(source_dec+" 加密后 : "+enc);
         // 解密
-        String source_enc = "KjNrK9YlP6YWWRnURn9soA==";
+        String source_enc = "SNe91sgGKxtErs+UX/lE7w==";
         String dec = IdCardCryptoUtil.symmetricDecryptIdCard(key, source_enc);
         System.out.println(source_enc+" 解密后 : "+dec);
 
@@ -51,10 +51,26 @@ public class IdCardCryptoUtil {
 
         System.out.println("====================== 实用 ======================");
         String[] strings={
-                "18566790558",
-                "18025361768",
-                "18575555197",
+                "13590339121",
+                "13631661625",
+                "13322980102",
+                "13632592442",
+                "13430419797",
+                "18124650573",
+                "13533812128",
+                "13316822721",
+                "13826520393",
+                "18681486898",
+                "18128825544",
+                "18126333814",
         };
+
+//        刘义	13410900924	19020722074
+//        杜海荣	15019258592	19020722059
+//        张志兴	13760735454	19020722087
+//        陈翠莉	13192669039	19020722072
+//        李大航	17799857610	19020722079
+
 //        String string="";
         for(String s:strings){
             String phoneJM=IdCardCryptoUtil.symmetricEncryptIdCard(key, s);
@@ -155,5 +171,3 @@ public class IdCardCryptoUtil {
         return data;
     }
 }
-
-

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java

@@ -52,7 +52,7 @@ public final class JasyptUtils {
          //加密
          String s = encryptWithMD5("szsf@zfjd", "ATPfOhpnAVp6yBas7RU");
          System.out.println(s);
-        String channelcs1 = decryptWithMD5("Y8AuVzQ311FOgJ4h07zjkLH8ArJBED3Xxz3Ug0ncPzuLXIVCuB25DA==", "ATPfOhpnAVp6yBas7RU");
+        String channelcs1 = decryptWithMD5("2fR5TkUb/A0p4+Gp/As+LJsVCjq7pgNwJIG2OAk2yWLXY/q7DNaCDQ==", "ATPfOhpnAVp6yBas7RU");
         System.out.println(channelcs1);
     }
 }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java

@@ -32,7 +32,7 @@ public class CorsFilter implements Filter {
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         //配置可信域名
         String[]  authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.196:3301",
-                "http://localhost:3301","http://10.132.108.3:81","http://10.132.108.3:85", "http://192.168.1.130:3301"};
+                "http://localhost:3301","http://10.132.108.3:81","http://10.132.108.3:85", "http://192.168.1.130:3301", "http://192.168.110.139:3301"};
         String authost = "";
         HttpServletRequest httprequest = (HttpServletRequest) request;
         String origin = httprequest.getHeader("Origin");

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/controller/IndexController.java

@@ -58,7 +58,11 @@ public class IndexController extends BaseController
         List<SystemCodeDto> systemCodeDtoList =  menuService.getSystemCodeByUser();
         mmap.put("menus", menus);
         mmap.put("user", user);
-        mmap.put("bureauDeptName", deptBean.getDeptName());
+        if (null != deptBean) {
+            mmap.put("bureauDeptName", deptBean.getDeptName());
+        } else {
+            mmap.put("bureauDeptName", "");
+        }
         mmap.put("systemCode",systemCodeDtoList);
         mmap.put("copyrightYear", ruoYiConfig.getCopyrightYear());
         mmap.put("demoEnabled", ruoYiConfig.isDemoEnabled());

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html

@@ -180,7 +180,7 @@
                                     </li>-->
                                     <li id="a" th:fragment="a">
                                         <p><span id="timeString" style="margin: 0"></span>：</p>
-                                        <p><label th:text="涉企执法总数"></label><b th:text="${total}"></b></p>
+                                        <p><label th:text="涉企执法总数"></label><b th:text="${total}"></b></p><p><label th:text="联合执法"></label><b th:text="${unite}"></b></p><p><label th:text="占比"></label><b th:text="${unite_per}"></b></p>
                                         <p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p>
                                     </li>
                                 </ul>
@@ -196,6 +196,10 @@
                             <span id="closeButton2" class="detail-close" onclick="closeUnite()">×</span>
                             <table id="bootstrap-table3"></table>
                         </div>
+                        <div id="detail3" class="detail-list">
+                            <span id="closeButton3" class="detail-close" onclick="close4()">×</span>
+                            <table id="bootstrap-table4"></table>
+                        </div>
                         <table id="bootstrap-table"></table>
                     </div>
 
@@ -414,7 +418,8 @@
                         formatter:function (value,row,index) {
                             if(value == 1){
                                 /*return "<span>是</span>";*/
-                                return '<span>'+'是'+'</span>';
+                                return '<span style="cursor: pointer;color: blue;" onclick="unionList(\''+row.unionNo+'\')">是</span>';
+                                // return '<span>'+'是'+'</span>';
                             }else{
                                 return "<span>否</span>";
                             }
@@ -496,7 +501,45 @@
             };
             console.log(options);
             $("#bootstrap-table").bootstrapTable(options);
+
+            var unionOptions={
+                modalName: "联合执法",
+                pagination: true,
+                columns: [
+                    {
+                        field : 'id',
+                        title : '主键ID',
+                        visible: false
+                    },
+                    {
+                        field : 'bureauDeptName',
+                        title : '执法单位',
+                    },
+                    {
+                        field : 'enterpriseName',
+                        title : '被执法企业名称',
+                    },
+                    {
+                        field : 'enforcementTime',
+                        title : '执法时间'
+                    }
+                ]
+            }
+            $("#bootstrap-table4").bootstrapTable(unionOptions);
         });
+
+        function unionList(union){
+            $.ajax({
+                url:prefix+'/unionList',
+                type:'post',
+                data:{unionNo: union},
+                success: function (res) {
+                    $('#detail3').show();
+                    $('#bootstrap-table4').bootstrapTable('load', res);
+                }
+            })
+        }
+
         $(function() {
             var options = {
                 modalName: "执法记录统计-联合执法",
@@ -1396,6 +1439,9 @@
         function closeUnite(){
             $('#detail2').hide();
         }
+        function close4(){
+            $('#detail3').hide();
+        }
         function downloadR(){
             var currentId=$('form').eq(0).attr('id');
             var params = $.common.formToJSON(currentId);

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/district-direct.html

@@ -43,7 +43,11 @@
       <span>综合数据</span>
     </div>
   </div>
-  <div class="link_btn"><a href="">各市直执法部门综合分析</a> <a href="" style="display: none;">各区执法综合分析</a></div>
+  <div class="link_btn">
+    <a href="" th:if="${roleFlag == 99}">各市直执法部门综合分析</a>
+    <a href="" th:if="${roleFlag == 1}">市直执法部门综合分析</a>
+<!--    <a href="" th:if="${roleFlag == 99}">各区执法综合分析</a>-->
+  </div>
   <div class="data_cont">
     <div class="data_item">
       <div class="cont-title">单独执法数量</div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html

@@ -682,7 +682,7 @@
           $("#s_njc_num").text("-");
         } else if (1 == result.data.roleFlag) {
           $("#leftFlag").text("各市值执法单位综合分析")
-          $("#rightFlag").text("各区直综合分析")
+          $("#rightFlag").text("各区综合分析")
         }
 
         non_jc_all = result.data.nonNum;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java

@@ -92,13 +92,14 @@ public class EnforcementRegistrationController extends BaseController
         enforcementRegistration.setEndTime(str.format(endTime));
 //        List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration);
         List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
-        List<EnforcementRegistration> uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList());
+        List<EnforcementRegistration> uniteList=list.stream().filter(item->item.getHasUnion()==1).collect(Collectors.toList());
         List<EnforcementRegistration> checkList=list.stream().filter(item->item.getCheckCategory()!=null&&!"".equals(item.getCheckCategory())&&item.getCheckCategory().equals("01")).collect(Collectors.toList());
         String checkName=iDictDataService.selectDictLabel("check_category","01");
 //        model.addAttribute("year",localDate.getYear());
         model.addAttribute("yearList",yearMake());
         model.addAttribute("total",list.size());
         model.addAttribute("unite",uniteList.size());
+        model.addAttribute("unite_per", (uniteList.size() * 100 + list.size() / 2) / list.size() + "%");
         /*model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));*/
         if(uniteList.size()>0){
             model.addAttribute("uniteDouble",str1.format((double)uniteList.size()/list.size()));
@@ -143,6 +144,14 @@ public class EnforcementRegistrationController extends BaseController
         returnList = getEnforcementRegistrations(enforcementRegistration);
         return getDataTable(returnList);
     }
+    @RequiresPermissions("code:registration:list")
+    @PostMapping("/unionList")
+    @ResponseBody
+    public TableDataInfo unionList(EnforcementRegistration enforcementRegistration)
+    {
+        List<EnforcementRegistration> returnList = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
+        return getDataTable(returnList);
+    }
 
     private List<EnforcementRegistration> getEnforcementRegistrations(EnforcementRegistration enforcementRegistration) {
         List<EnforcementRegistration> returnList;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelCityController.java

@@ -1,5 +1,7 @@
 package com.zdxt.code.controller;
 
+import com.zdxt.auth.dto.DeptBean;
+import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.DeptApi;
 import com.zdxt.auth.feign.DictDataApi;
 import com.zdxt.auth.feign.UserApi;
@@ -13,6 +15,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,10 +28,37 @@ public class StatisticalPanelCityController extends BaseController {
 
     @Autowired
     private IStatisticalPaneCityService i_statisticalPaneCityService;
+    @Autowired private DeptApi deptApi;
+    @Autowired private UserApi userApi;
 
     /*------------------------------------------综合分析-新版--------------------------------*/
     @GetMapping("/city-direct")
-    public String cityDirect(Model model) { return "project/code/statistical-new/city-direct"; }
+    public String cityDirect(Model model) {
+        UserBean ub = userApi.getCurrentUser();
+        DeptBean deptBean = deptApi.getDeptById(ub.getDeptId());
+        if (java.util.Objects.toString(deptBean.getZzDisplayPath(), "").contains("深圳市司法局")) {
+            // 市司法局
+            model.addAttribute("roleFlag",99);
+        } else if (java.util.Objects.toString(deptBean.getZzDisplayPath(), "").contains("司法局")) {
+            // 区司法局
+            model.addAttribute("roleFlag",9);
+        } else {
+            deptBean = deptApi.iterationDeptParentToBureau(ub.getDeptId());
+            if (null == deptBean) {
+                model.addAttribute("roleFlag",99);
+            } else if (4 == deptBean.getZone()) {
+                // 街道
+                model.addAttribute("roleFlag",4);
+            } else if (3 == deptBean.getZone()) {
+                // 区直
+                model.addAttribute("roleFlag",3);
+            } else if (1 == deptBean.getZone()) {
+                // 市值
+                model.addAttribute("roleFlag",1);
+            }
+        }
+        return "project/code/statistical-new/city-direct";
+    }
 
 
     /** 市数据 */

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java

@@ -258,7 +258,10 @@ public class StatisticalPanelController extends BaseController {
             resMap.put("roleDept", deptName);
         } else {
             deptBean = deptApi.iterationDeptParentToBureau(ub.getDeptId());
-            if (4 == deptBean.getZone()) {
+            if (null == deptBean) {
+                resMap.put("roleFlag", 99);
+                resMap.put("roleDept", "");
+            } else if (4 == deptBean.getZone()) {
                 // 街道
                 resMap.put("roleFlag", 4);
                 resMap.put("roleDept", deptBean.getDeptName());

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelDistrictController.java

@@ -1,5 +1,7 @@
 package com.zdxt.code.controller;
 
+import com.zdxt.auth.dto.DeptBean;
+import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.DeptApi;
 import com.zdxt.auth.feign.DictDataApi;
 import com.zdxt.auth.feign.UserApi;
@@ -26,10 +28,37 @@ public class StatisticalPanelDistrictController extends BaseController {
 
     @Autowired
     private IStatisticalPaneDistrictService i_statisticalPaneDistrictService;
+    @Autowired private DeptApi deptApi;
+    @Autowired private UserApi userApi;
 
     /*------------------------------------------综合分析-新版--------------------------------*/
     @GetMapping("/district-direct")
-    public String districtDirect(Model model) { return "project/code/statistical-new/district-direct"; }
+    public String districtDirect(Model model) {
+        UserBean ub = userApi.getCurrentUser();
+        DeptBean deptBean = deptApi.getDeptById(ub.getDeptId());
+        if (java.util.Objects.toString(deptBean.getZzDisplayPath(), "").contains("深圳市司法局")) {
+            // 市司法局
+            model.addAttribute("roleFlag",99);
+        } else if (java.util.Objects.toString(deptBean.getZzDisplayPath(), "").contains("司法局")) {
+            // 区司法局
+            model.addAttribute("roleFlag",9);
+        } else {
+            deptBean = deptApi.iterationDeptParentToBureau(ub.getDeptId());
+            if (null == deptBean) {
+                model.addAttribute("roleFlag",99);
+            } else if (4 == deptBean.getZone()) {
+                // 街道
+                model.addAttribute("roleFlag",4);
+            } else if (3 == deptBean.getZone()) {
+                // 区直
+                model.addAttribute("roleFlag",3);
+            } else if (1 == deptBean.getZone()) {
+                // 市值
+                model.addAttribute("roleFlag",1);
+            }
+        }
+        return "project/code/statistical-new/district-direct";
+    }
 
 
     /** 市数据 */

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqOrderFlow.java

@@ -36,7 +36,7 @@ public class MssqOrderFlow extends BaseDomain {
     /**
      * 文件
      */
-    private AppFiles appFiles;
+//    private AppFiles appFiles;
     private String appOrgShortname;
 
     public String getAppOrgName() {
@@ -87,13 +87,13 @@ public class MssqOrderFlow extends BaseDomain {
         this.state = state;
     }
 
-    public AppFiles getAppFiles() {
-        return appFiles;
-    }
-
-    public void setAppFiles(AppFiles appFiles) {
-        this.appFiles = appFiles;
-    }
+//    public AppFiles getAppFiles() {
+//        return appFiles;
+//    }
+//
+//    public void setAppFiles(AppFiles appFiles) {
+//        this.appFiles = appFiles;
+//    }
 
     public String getAppOrgShortname() {
         return appOrgShortname;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java

@@ -168,8 +168,8 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
         enterpriseComplaint.setId(IdUtil.simpleUUID());
         //默认工单为已受理
         enterpriseComplaint.setStatus(0);
-        //TODO 暂时注释，后续启用
-//        complaintStatisticsService.insertComplaintStatistics(enterpriseComplaint);
+        //TODO 之前注释，现在启用
+        complaintStatisticsService.insertComplaintStatistics(enterpriseComplaint);
         int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint);
         if(i==0)return i;
         // 更新记录表投诉状态 0行政 1非行政

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java

@@ -75,8 +75,8 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
         Set<String> bureauDeptNames = new HashSet();
         Set<String> bureauDeptIds = new HashSet();
         for (EnterpriseLawEnforcement tmp : lawUnites) {
-            bureauDeptNames.add(tmp.getLawEnforcement());
-            bureauDeptIds.add(tmp.getLawEnforcementId());
+            bureauDeptNames.add(tmp.getBureauDeptName());
+            bureauDeptIds.add(tmp.getBureauDeptId());
         }
         enterpriseLawEnforcement.setBureauDeptName(String.join(",", bureauDeptNames));
         enterpriseLawEnforcement.setBureauDeptId(String.join(",", bureauDeptIds));

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java

@@ -290,7 +290,7 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg
             row.createCell(2).setCellValue(li.getArea());
             row.createCell(3).setCellValue(li.getStreet());
             row.createCell(4).setCellValue(li.getLawEnforcer());
-            row.createCell(5).setCellValue(DateUtils.parseDateToStr("YYYY-MM-dd HH:mm:ss",li.getEnforcementTime()));
+            row.createCell(5).setCellValue(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",li.getEnforcementTime()));
             row.createCell(6).setCellValue(li.getLawEnforcementTypeText());
             row.createCell(7).setCellValue(li.getLawEnforcementItemText());
             row.createCell(8).setCellValue(li.getLawEnforcementBasisText());

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -529,7 +529,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
         select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,r.enterprise_address,r.law_enforcement_item_text,r.unite_check,
-        r.check_category,r.check_css,r.is_complaint,r.create_time,r.law_id, r.enforcement_time,r.law_enforce_category, r.entrust_dept_name, r.has_auto, r.has_union
+        r.check_category,r.check_css,r.is_complaint,r.create_time,r.law_id, r.enforcement_time,r.law_enforce_category, r.entrust_dept_name, r.has_auto, r.has_union, r.union_no
         from enforcement_registration r
         <where>
             and r.bureau_dept_name is not null

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml

@@ -178,19 +178,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and n.law_enforcement_type =#{lawEnforcementType}
         </if>
 
-        <if test="year != null and year != ''">
+        <if test="dateSearch == 'year' and year != null and year != ''">
             AND YEAR(n.enforcement_time) = #{year}
         </if>
-        <if test="quarter != null and quarter != '' ">
+        <if test="dateSearch == 'quarter' and quarter != null and quarter != '' ">
             AND QUARTER(n.enforcement_time) = #{quarter}
         </if>
-        <if test="month != null and month != '' ">
+        <if test="dateSearch == 'month' and month != null and month != '' ">
             AND MONTH(n.enforcement_time) = #{month}
         </if>
-        <if test="startTime != null and startTime != '' ">
+        <if test="dateSearch == 'selectTime' and startTime != null and startTime != '' ">
             and DATE_FORMAT(n.enforcement_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d')
         </if>
-        <if test="endTime != null and endTime != '' ">
+        <if test="dateSearch == 'selectTime' and endTime != null and endTime != '' ">
             and DATE_FORMAT(n.enforcement_time,'%Y-%m-%d') <![CDATA[<=]]> STR_TO_DATE(#{endTime},'%Y-%m-%d')
         </if>
         <!-- 数据范围过滤 -->