统计修改

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java

@@ -1,6 +1,7 @@
 package com.zdxt.app.controller;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Lists;
 import com.zdxt.auth.project.system.dept.mapper.DeptMapper;
 import com.zdxt.auth.project.system.user.mapper.UserMapper;
@@ -259,14 +260,22 @@ public class AppEnforcementCheckStatisticsController extends BaseController {
         if(searchType.getEndTime()==null||"".equals(searchType.getEndTime())){
             searchType.setEndTime("0");
         }
+        if(searchType.getUserId()!=null){
             Long userId=searchType.getUserId();
             String lawCertificateNum=userMapper.selectUserById(userId).getLawCertificateNum();
-        String deptId=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm();
+            if(!StrUtil.hasEmpty(lawCertificateNum)){
-        /*String certificateNumber=userMapper.selectUserById(userId).getCertificateNumber();
+                String zzjgdm=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm();
-        String deptId=zfryjdm2405301Mapper.selectZfryBySfz(certificateNumber).getZzjgdm();*/
+                if(!StrUtil.hasEmpty(zzjgdm)){
+                    String deptId=deptMapper.selectDeptByCreditcode(zzjgdm).getDeptId();//通过creditcode=zzjgdm查找出对应的deptid
+                    if(!StrUtil.hasEmpty(deptId)) {
                         searchType.setUserId(null);
                         searchType.setBureauDeptId(deptId);
                         List<StatisticsIndicatorPart> statisticsIndicatorPartList = enforcementCheckStatisticsService.statisticsIndicatorPart3(searchType);
                         return ZDResponse.success("成功", statisticsIndicatorPartList);
                     }
                 }
+            }
+        }
+        return ZDResponse.success("该执法人员执法部门为空");
+    }
+}

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

@@ -902,7 +902,6 @@
                         ydata12.push(e.monthTotal12)
                     });
                 }
-                debugger
                 option={
                     color:["#2d4beb","#03a978",],
                     legend: {

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

@@ -191,8 +191,12 @@
                     field : 'name',
                     title : '区域',
                     formatter:function (value,row,index) {
+                        if(value=="其他"){
+                            return '<span>'+value+'</span>';
+                        }else {
                             return '<span style="cursor: pointer;color: blue;" ONCLICK="jd(\'' + value + '\')">' + value + '</span>';
                         }
+                    }
                 },
                 {
                     field : 'totalNumber',
@@ -432,6 +436,18 @@
                         {
                             field : 'name',
                             title : '街道',
+                            formatter:function (value,row,index) {
+                                var obj=document.getElementById("jd");
+                                var options=obj.options;
+                                var index=obj.selectedIndex;
+                                console.log(obj.options[obj.selectedIndex].text);
+                                if(value==obj.options[obj.selectedIndex].text){
+                                    return '<span style="color: #41D522;">'+value+'</span>'
+                                }else {
+                                    return value;
+                                }
+                            }
+
                         },
                         {
                             field : 'totalNumber',

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

@@ -217,16 +217,24 @@ public class EnforcementCheckStatisticsController extends BaseController {
         if(searchType.getEndTime()==null||"".equals(searchType.getEndTime())){
             searchType.setEndTime("0");
         }
+        if(searchType.getUserId()!=null && !"".equals(searchType.getcType())){
             Long userId=searchType.getUserId();
             String lawCertificateNum=userMapper.selectUserById(userId).getLawCertificateNum();
-        String deptId=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm();//待修改，组织机构代码非deptId
+            if(lawCertificateNum!=null && !"".equals(lawCertificateNum)){
-        /*String certificateNumber=userMapper.selectUserById(userId).getCertificateNumber();
+                String zzjgdm=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm();
-        String deptId=zfryjdm2405301Mapper.selectZfryBySfz(certificateNumber).getZzjgdm();*/
+                if(zzjgdm!=null && !"".equals(zzjgdm)){
+                    String deptId=deptMapper.selectDeptByCreditcode(zzjgdm).getDeptId();//通过creditcode=zzjgdm查找出对应的deptid
+                    if(deptId!=null && !"".equals(deptId)) {
                         searchType.setUserId(null);
                         searchType.setBureauDeptId(deptId);
                         List<StatisticsIndicatorPart> statisticsIndicatorPartList = enforcementCheckStatisticsService.statisticsIndicatorPart3(searchType);
                         return ZDResponse.success("成功", statisticsIndicatorPartList);
                     }
+                }
+            }
+        }
+        return ZDResponse.success("该执法人员执法部门为空");
+    }
 
     @PostMapping("/zfjdm")
     @ResponseBody

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

@@ -263,6 +263,7 @@ public class StatisticsEnterpriseServiceImpl implements StatisticsEnterpriseServ
                 s1row.createCell(2).setCellValue(s.getNumInt());
                 s1row.createCell(3).setCellValue(s.getValue());
                 qyRowNum++;
+                if(!s.getName().equals("其他")) {
                     //街道页
                     HSSFSheet sheet = workbook.createSheet(s.getName());
                     sheet.setDefaultColumnWidth(20);//全局
@@ -298,6 +299,7 @@ public class StatisticsEnterpriseServiceImpl implements StatisticsEnterpriseServ
                     }
                 }
             }
+        }
         //设置流格式
         response.setCharacterEncoding("UTF-8");
         response.setContentType("application/vnd.ms-excel");

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

@@ -713,6 +713,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         ( SELECT * FROM enforcement_registration
         <where>
+            and bureau_dept_name is not null
+            and law_enforcement_id is not null
+            and enterprise_name is not null
+            and enterprise_number is not null
+            and law_enforcer is not null
+            and law_enforcer_two is not null
+            and is_complaint is not null
+            and check_category is not null
+            and bureau_dept_id is not null
             <if test="enterpriseName != null and enterpriseName != ''">
                 AND enterprise_name like concat(concat('%',#{enterpriseName}),'%')
             </if>
@@ -747,7 +756,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         ORDER BY create_time DESC LIMIT 1000000000 ) t
-        GROUP BY t.bureau_dept_id
+        GROUP BY t.bureau_dept_id,concat(law_enforcer, law_enforcer_two),law_enforcement_item_text
         order by t.create_time
     </select>
     <select id="selectUnite" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">

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

@@ -37,9 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectZfryjdmList2" parameterType="Zfryjdm2405301" resultMap="ZfryjdmResult">
-        select z.id, z.sfyx, z.rylx, z.zfzzfdw, z.zfryid, z.name, z.sfzcode, z.zzjgdm, z.zfdw, z.address, z.sub_name, z.is_lawcode, z.code_state, z.zfcode, z.sfzcode_encrypt, s.phoneNumber
+        select z.id,  z.name, z.sfzcode, z.zzjgdm, z.zfdw, z.sub_name, z.zfcode, z.sfzcode_encrypt, s.phoneNumber
         from (
-        select id, sfyx, rylx, zfzzfdw, zfryid, name, sfzcode, zzjgdm, zfdw, address, sub_name, is_lawcode, code_state, zfcode, sfzcode_encrypt
+        select id, name, sfzcode, zzjgdm, zfdw, sub_name, zfcode, sfzcode_encrypt
         from zfryjdm2405301
         <where>
             and code_state = '01'
@@ -49,10 +49,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null and name != ''">and name like concat('%',#{name},'%')</if>
             <if test="zfdw != null and zfdw != ''">and zfdw like concat('%',#{zfdw},'%')</if>
             <if test="zfcode != null and zfcode != ''">and zfcode like concat('%',#{zfcode},'%')</if>
-        </where>) z
+        </where>
+        group by sfzcode) z
         left join (select phoneNumber, certificateNumber from sys_user where law_certificate_num is not null and user_source = 0 and status='0' and del_flag='0' group by certificateNumber) s
         on z.sfzcode_encrypt=s.certificateNumber
-        group by z.sfzcode
     </select>
 
     <update id="updateZfryjdmSfzcodeByid" parameterType="Zfryjdm2405301">