执法分析统计修改

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

@@ -342,7 +342,7 @@
                                 let string='';
                                 if (value.length > 0) {
                                     for (let i = 0; i < value.length; i++) {
-                                        string = string + '<img style="cursor: pointer;" src="' + value[i] + '" @click="openPicture(\''+value[i]+'\')"></img>';
+                                        string = string + '<img style="cursor: pointer;height: 90%;width: 50%;" src="' + value[i] + '" ONCLICK="openPicture(\''+value[i]+'\')"></img>';
                                     }
                                 }
                                 return string;
@@ -594,6 +594,7 @@
             })
         }
         function openPicture(url){
+            debugger
             if(url!=null&&url!=''){
                 this.$message.warning('图片不存在');
             }else{

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

@@ -254,7 +254,6 @@
         var caseType=[];
         var prefix = ctx + "code/registration";
         var prefixC= ctx+"code/complaintStatic";
-        var prefixDict=ctx+'system/dict/data';
         var quarterBoolean=/*[[${quarterBoolean}]]*/{};
         var monthBoolean=/*[[${monthBoolean}]]*/{};
         var unite=/*[[${unite}]]*/{};

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

@@ -29,6 +29,17 @@
                                 <p>检查事项：</p>
                                 <input type="text" name="lawEnforcementItemText"/>
                             </li>
+                            <li>
+                                <p>区域：</p>
+                                <select id="qy" name="qy" th:with="type=${@dict.getType('address_type')}" onchange="addressMake()">
+                                    <option value="">全市</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                                <select id="jd" name="jd">
+                                    <option value="">所有街道</option>
+                                    <option th:fragment="jd" th:each="j:${jdList}" th:text="${j.dictLabel}" th:value="${j.dictValue}"></option>
+                                </select>
+                            </li>
                             <li>
                                 <p>时段：</p>
 <!--                                <select id="year" name="year">-->
@@ -126,6 +137,7 @@
             $("#month").hide();
             $("#select-time").hide();
             $("#showDetail").hide();
+            $("#jd").hide();
         };
         $(function() {
             var options = {
@@ -135,14 +147,24 @@
                 removeUrl: prefix + "/remove",
                 detailUrl: prefix + "/detail/{id}",
                 exportUrl: prefix + "/export",
-                height: $(window).height()-$(".search-collapse").height()-$("#toolbar").height()-50,
+                //height: $(window).height()-$(".search-collapse").height()-$("#toolbar").height()-50,
                 modalName: "执法分析",
                 showHeader: false,
                 showFooter: false,
                 showColumns: false,
                 showRefresh: false,
                 showToggle: false,
+                pagination: true,
+                pageSize: 10,
                 columns: [
+                    {
+                        field : 'qy',
+                        title : '区域'
+                    },
+                    {
+                        field : 'jd',
+                        title : '街道'
+                    },
                     {
                         field : 'enterpriseName',
                         title : '企业名称',
@@ -479,6 +501,25 @@
             $('form').eq(0).trigger("reset");
             search1();
             timeType();
+            addressMake();
+        }
+        function addressMake(){
+            var dateSearch = document.getElementById("qy");
+            console.log(dateSearch.value)
+            if(dateSearch.value!=null&&dateSearch.value!=""){
+                $("#jd").show();
+                $.ajax({
+                    url:prefix+'/jdList',
+                    type:'GET',
+                    data: {"name":dateSearch.value},
+                    success: function (response) {
+                        $('#jd').html(response);
+                    }
+                })
+            }else {
+                $("#jd").hide();
+                document.getElementById("jd").value='';
+            }
         }
     </script>
 </body>

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

@@ -265,9 +265,11 @@ public class EnforcementRegistrationController extends BaseController
     @PostMapping("/staticEnforcementRegistration")
     @ResponseBody
     public TableDataInfo staticList(EnforcementRegistrationDto enforcementRegistrationDto){
-        startPage();
+        /*startPage();
+        List<EnforcementRegistrationDto> enforcementRegistrationDtos = enforcementRegistrationService.
+                staticEnforcementRegistration(enforcementRegistrationDto);*/
         List<EnforcementRegistrationDto> enforcementRegistrationDtos = enforcementRegistrationService.
-                staticEnforcementRegistration(enforcementRegistrationDto);
+                staticEnforcementRegistrationLI(enforcementRegistrationDto);
         return getDataTable(enforcementRegistrationDtos);
     }
 

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

@@ -62,6 +62,9 @@ public class EnforcementRegistrationDto extends BaseDomain {
      */
     private String endTime;
 
+    private String qy;
+    private String jd;
+    private String enterpriseAddress;
 
     public String getEnterpriseName() {
         return enterpriseName;
@@ -174,4 +177,28 @@ public class EnforcementRegistrationDto extends BaseDomain {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public String getQy() {
+        return qy;
+    }
+
+    public void setQy(String qy) {
+        this.qy = qy;
+    }
+
+    public String getJd() {
+        return jd;
+    }
+
+    public void setJd(String jd) {
+        this.jd = jd;
+    }
+
+    public String getEnterpriseAddress() {
+        return enterpriseAddress;
+    }
+
+    public void setEnterpriseAddress(String enterpriseAddress) {
+        this.enterpriseAddress = enterpriseAddress;
+    }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java

@@ -102,6 +102,7 @@ public interface EnforcementRegistrationMapper
      * @return
      */
     List<EnforcementRegistrationDto> staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto);
+    List<EnforcementRegistrationDto> staticEnforcementRegistrationLI(EnforcementRegistrationDto enforcementRegistrationDto);
 
     /**
      * 统计分析，统计分类列表

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

@@ -99,6 +99,8 @@ public interface IEnforcementRegistrationService
      */
     List<EnforcementRegistrationDto> staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto);
 
+    List<EnforcementRegistrationDto> staticEnforcementRegistrationLI(EnforcementRegistrationDto enforcementRegistrationDto);
+
     /**
      * 统计分析列表详细清单
      * @param enforcementRegistrationDto

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

@@ -533,6 +533,123 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 enforcementRegistrationMapper.staticEnforcementRegistration(enforcementRegistrationDto);
         return enforcementRegistrationDtos;
     }
+    @Override
+    public List<EnforcementRegistrationDto> staticEnforcementRegistrationLI(EnforcementRegistrationDto enforcementRegistrationDto) {
+        /*if(enforcementRegistrationDto.getQy()!=null&&!"".equals(enforcementRegistrationDto.getQy())) {
+            if (enforcementRegistrationDto.getJd() != null && !"".equals(enforcementRegistrationDto.getJd())) {
+                String qy = iDictDataService.selectDictLabel("address_Type", enforcementRegistrationDto.getQy());
+                String jd = iDictDataService.selectDictLabel(enforcementRegistrationDto.getQy(), enforcementRegistrationDto.getJd());
+                enforcementRegistrationDto.setJd(jd);
+                enforcementRegistrationDto.setQy(qy);
+                *//*List<EnforcementRegistrationDto> enforcementRegistrationDtos =
+                        enforcementRegistrationMapper.staticEnforcementRegistrationLI(enforcementRegistrationDto);*//*
+            }else {
+                String qy = iDictDataService.selectDictLabel("address_Type", enforcementRegistrationDto.getQy());
+                enforcementRegistrationDto.setQy(qy);
+            }
+        }
+        List<EnforcementRegistrationDto> enforcementRegistrationDtos =
+                enforcementRegistrationMapper.staticEnforcementRegistrationLI(enforcementRegistrationDto);
+        return enforcementRegistrationDtos;*/
+        if(enforcementRegistrationDto.getQy()!=null&&!"".equals(enforcementRegistrationDto.getQy())){
+            if(enforcementRegistrationDto.getJd()!=null&&!"".equals(enforcementRegistrationDto.getJd())){
+                String qy=iDictDataService.selectDictLabel("address_Type",enforcementRegistrationDto.getQy());
+                String jd=iDictDataService.selectDictLabel(enforcementRegistrationDto.getQy(),enforcementRegistrationDto.getJd());
+                enforcementRegistrationDto.setJd(jd);
+                enforcementRegistrationDto.setQy(qy);
+                List<EnforcementRegistrationDto> enforcementRegistrationDtos =
+                        enforcementRegistrationMapper.staticEnforcementRegistrationLI(enforcementRegistrationDto);
+                for(int i=0;i<enforcementRegistrationDtos.size();i++){
+                    enforcementRegistrationDtos.get(i).setQy(qy);
+                    enforcementRegistrationDtos.get(i).setJd(jd);
+                }
+                return enforcementRegistrationDtos;
+            }else {
+                List<EnforcementRegistrationDto> enforcementRegistrationDtos =new ArrayList<>();
+                String qy=iDictDataService.selectDictLabel("address_Type",enforcementRegistrationDto.getQy());
+                List<DictData> jdList=iDictDataService.selectDictDataByType(enforcementRegistrationDto.getQy());
+                enforcementRegistrationDto.setQy(qy);
+                List<EnforcementRegistrationDto> enforcementRegistrationDtoList =
+                        enforcementRegistrationMapper.staticEnforcementRegistrationLI(enforcementRegistrationDto);
+                /*List<String> jdStrings=new ArrayList<>();
+                for(DictData dictData:jdList){
+                    jdStrings.add(dictData.getDictLabel());
+                }*/
+                for(DictData jd:jdList){
+                    List<EnforcementRegistrationDto> jdEList=new ArrayList<>();
+                    if(qy.equals("光明区")){
+                        jdEList=enforcementRegistrationDtoList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区"+jd.getDictLabel())||item.getEnterpriseAddress().startsWith("深圳市"+qy+jd.getDictLabel())).collect(Collectors.toList());
+                    }else {
+                        jdEList=enforcementRegistrationDtoList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy+jd.getDictLabel())).collect(Collectors.toList());
+                    }
+                    if(jdEList.size()>0){
+                        for(int i=0;i<jdEList.size();i++){
+                            jdEList.get(i).setQy(qy);
+                            jdEList.get(i).setJd(jd.getDictLabel());
+                        }
+                        enforcementRegistrationDtos.addAll(jdEList);
+                    }
+                }
+                List<EnforcementRegistrationDto>qtjdList=enforcementRegistrationDtoList.stream().filter(item->!jdMake(qy,jdList,item.getEnterpriseAddress())).collect(Collectors.toList());
+                if(qtjdList.size()>0){
+                    for(int i=0;i<qtjdList.size();i++){
+                        qtjdList.get(i).setQy(qy);
+                    }
+                    enforcementRegistrationDtos.addAll(qtjdList);
+                }
+                return enforcementRegistrationDtos;
+            }
+        }else {
+            List<DictData> qyList=iDictDataService.selectDictDataByType("address_Type");
+            List<String> qyStrings=new ArrayList<>();
+            for(DictData dictData:qyList){
+                qyStrings.add(dictData.getDictLabel());
+            }
+            List<EnforcementRegistrationDto> enforcementRegistrationDtoList =
+                    enforcementRegistrationMapper.staticEnforcementRegistrationLI(enforcementRegistrationDto);
+            List<EnforcementRegistrationDto> enforcementRegistrationDtos=new ArrayList<>();
+            for(DictData qy:qyList){
+                List<DictData> jdList=iDictDataService.selectDictDataByType(qy.getDictValue());
+                /*List<String> jdStrings=new ArrayList<>();
+                for(DictData dictData:jdList){
+                    jdStrings.add(dictData.getDictLabel());
+                }*/
+                List<EnforcementRegistrationDto> qyEList=new ArrayList<>();
+                if(qy.getDictLabel().equals("光明区")){
+                    qyEList=enforcementRegistrationDtoList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区")||item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel())).collect(Collectors.toList());
+                }else {
+                    qyEList=enforcementRegistrationDtoList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel())).collect(Collectors.toList());
+                }
+                for(DictData jd:jdList){
+                    List<EnforcementRegistrationDto> jdEList=new ArrayList<>();
+                    if(qy.getDictLabel().equals("光明区")){
+                        jdEList=qyEList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区"+jd.getDictLabel())||item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel()+jd.getDictLabel())).collect(Collectors.toList());
+                    }else {
+                        jdEList=qyEList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel()+jd.getDictLabel())).collect(Collectors.toList());
+                    }
+                    if(jdEList.size()>0){
+                        for(int i=0;i<jdEList.size();i++){
+                            jdEList.get(i).setQy(qy.getDictLabel());
+                            jdEList.get(i).setJd(jd.getDictLabel());
+                        }
+                        enforcementRegistrationDtos.addAll(jdEList);
+                    }
+                }
+                List<EnforcementRegistrationDto>qtjdList=qyEList.stream().filter(item->!jdMake(qy.getDictLabel(),jdList,item.getEnterpriseAddress())).collect(Collectors.toList());
+                if(qtjdList.size()>0){
+                    for(int i=0;i<qtjdList.size();i++){
+                        qtjdList.get(i).setQy(qy.getDictLabel());
+                    }
+                    enforcementRegistrationDtos.addAll(qtjdList);
+                }
+            }
+            List<EnforcementRegistrationDto>qtqyList=enforcementRegistrationDtoList.stream().filter(item->!qyMake(qyStrings,item.getEnterpriseAddress())).collect(Collectors.toList());
+            if(qtqyList.size()>0){
+                enforcementRegistrationDtos.addAll(qtqyList);
+            }
+            return enforcementRegistrationDtos;
+        }
+    }
 
     @Override
     public List<EnforcementRegistrationDto> staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto) {
@@ -557,14 +674,6 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         LocalDate lastDayOfMonth = lastLocalDate.with(TemporalAdjusters.lastDayOfMonth());
         return firstDayOfMonth +"," + lastDayOfMonth;
     }
-    public Boolean qyMake(List<String> stringList,String s){
-        for (String string : stringList) {
-            if (s.startsWith(string)) {
-                return true;
-            }
-        }
-        return false;
-    }
 
     /*@Override
     public void export(HttpServletResponse httpServletResponse,EnforcementRegistration enforcementRegistration,List<EnforcementRegistration> list){
@@ -584,5 +693,35 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
             row.createCell(1).setCellValue();
         }
     }*/
+    public Boolean qyMake(List<String> strings,String s){
+        for (String string : strings) {
+            if(string.equals("光明区")){
+                if (s.startsWith("深圳市" + string)||s.startsWith("深圳市光明新区")) {
+                    return true;
+                }
+            }else {
+                if (s.startsWith("深圳市" + string)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    public Boolean jdMake(String qy, List<DictData> stringList, String s){
 
+        if(qy.equals("光明区")){
+            for(DictData d:stringList){
+                if(s.startsWith("深圳市"+qy+d.getDictLabel())||s.startsWith("深圳市光明新区"+d.getDictLabel())){
+                    return true;
+                }
+            }
+        }else {
+            for (DictData d : stringList) {
+                if (s.startsWith("深圳市"+qy+d.getDictLabel())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 }

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

@@ -50,7 +50,7 @@
     <select id="selectAllStatisticsList" parameterType="EnforcementCheckStatistics" resultMap="EnforcementCheckStatisticsResult">
         select e.bureau_dept_name,e.bureau_dept_id,e.law_enforcement_id,e.enterprise_number,i.enterprise_name,concat(e.law_enforcer,",",e.law_enforcer_two)as lawEnforcerTwo,e.law_enforcement_item_text,e.remark,i.enterprise_address
         from enforcement_registration e
-        left join sys_user s on e.law_enforcement_id=s.dept_id
+        left join sys_dept s on e.bureau_dept_id=s.dept_id
         left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on e.enterprise_number=i.enterprise_number
         <where>
             and (e.enterprise_number not like "92440300MACQUM2M9C"

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

@@ -640,6 +640,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by t.create_time
     </select>
 
+    <select id="staticEnforcementRegistrationLI" resultType="com.zdxt.code.domain.dto.EnforcementRegistrationDto" parameterType="EnforcementRegistrationDto">
+        SELECT
+        enterprise_name,enterprise_number,bureau_dept_name,law_enforcer,law_enforcer_two,law_enforcement_item_text,enterprise_address,count( t.id ) AS total
+        FROM
+        ( SELECT r.id,r.enterprise_name,r.enterprise_number,r.bureau_dept_name,r.law_enforcer,r.law_enforcer_two,r.law_enforcement_item_text,r.create_time,i.enterprise_address from enforcement_registration r
+        left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on r.enterprise_number=i.enterprise_number
+        <where>
+            <if test="qy != null  and qy != ''">
+                <if test="qy!='光明区'.toString()">and i.enterprise_address like concat('深圳市',#{qy}, '%')</if>
+                <if test="qy=='光明区'.toString()">and ( i.enterprise_address like concat('深圳市',#{qy}, '%')or i.enterprise_address like '深圳市光明新区%')</if>
+                <if test="jd != null  and jd != ''">
+                    <if test="qy!='光明区'.toString()">and i.enterprise_address like concat('深圳市',#{qy},#{jd}, '%')</if>
+                    <if test="qy=='光明区'.toString()">and ( i.enterprise_address like concat('深圳市光明区',#{jd}, '%')or i.enterprise_address like concat('深圳市光明新区',#{jd}, '%'))</if>
+                </if>
+            </if>
+            <if test="enterpriseName != null and enterpriseName != ''">
+                AND r.enterprise_name like concat(concat('%',#{enterpriseName}),'%')
+            </if>
+            <if test="bureauDeptName != null and bureauDeptName != ''">
+                AND r.bureau_dept_name like concat(concat('%',#{bureauDeptName}),'%')
+            </if>
+            <if test="lawEnforcer != null and lawEnforcer != ''">
+                AND (r.law_enforcer like concat(concat('%',#{lawEnforcer}),'%')
+                or
+                r.law_enforcer_two like concat(concat('%',#{lawEnforcer}),'%'))
+            </if>
+            <if test="lawEnforcementItemText != null and lawEnforcementItemText != ''">
+                AND r.law_enforcement_item_text like concat(concat('%',#{lawEnforcementItemText}),'%')
+            </if>
+            <if test="year != null and year != ''">
+                AND YEAR(r.create_time) = #{year}
+            </if>
+            <if test="quarter != null and quarter != '' ">
+                AND QUARTER(r.create_time) = #{quarter}
+            </if>
+            <if test="month != null and month != '' ">
+                AND DATE_FORMAT(r.create_time, '%m') = #{month}
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''">
+                AND <![CDATA[  r.create_time >=  #{params.beginTime} ]]>
+            </if>
+            <if test="params.endTime != null and params.endTime != ''">
+                AND <![CDATA[  r.create_time <= #{params.endTime} ]]>
+            </if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                and DATE_FORMAT(r.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                and DATE_FORMAT(r.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
+            </if>
+        </where>
+        ORDER BY r.create_time DESC LIMIT 1000000000 ) t
+        GROUP BY
+        t.enterprise_number
+        order by t.create_time
+    </select>
+
     <select id="staticEnforcementRegistrationDetail" resultType="com.zdxt.code.domain.dto.EnforcementRegistrationDto" parameterType="EnforcementRegistrationDto">
         SELECT
             bureau_dept_name,