部门统计，综合分析，执法分析修改

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

@@ -43,7 +43,6 @@
                                 <p><label th:text="执法部门"></label><b th:text="${deptNumber}"></b></p>
                                 <p></i><label th:text="执法人员"></label><b th:text="${lawNumber}"></b></p>
                             </li>
-
                         </ul>
                     </div>
                 </div>

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

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <li id="b" th:fragment="b">
+    <li th:fragment="b">
         <p>全市:</p>
         <p><label th:text="执法部门"></label><b th:text="${deptNumber}"></b></p>
         <p></i><label th:text="执法人员"></label><b th:text="${lawNumber}"></b></p>

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

@@ -212,15 +212,15 @@
                         <div class="chart-box" id="container3" style="width: 500px; height: 500px;"></div>
                         <div class="chart-box" id="container4" style="width: 500px; height: 500px;"></div>-->
                         <div class="chart-box">
-                            <h3 class="chart-title">2024年年度执法检查排行（TOP10）</h3>
+                            <h3 class="chart-title"><span id="echarts2-title" class="chart-title"></span>执法检查排行（TOP10）</h3>
                             <div class="echarts" id="echarts2" style="width: 800px; height: 300px;"></div>
                         </div>
                         <div class="chart-box">
-                            <h3 class="chart-title">2024年季度执法检查排行（TOP10）</h3>
+                            <h3 class="chart-title"><span id="echarts3-title" class="chart-title"></span>执法检查排行（TOP10）</h3>
                             <div class="echarts" id="echarts3" style="width: 600px; height: 300px;"></div>
                         </div>
                         <div class="chart-box">
-                            <h3 class="chart-title">2024年月度执法检查排行（TOP10）</h3>
+                            <h3 class="chart-title"><span id="echarts4-title" class="chart-title"></span>执法检查排行（TOP10）</h3>
                             <div class="echarts" id="echarts4" style="width: 800px; height: 300px;"></div>
                         </div>
                     </div>
@@ -250,6 +250,9 @@
         var rowData=[];
         /*var echart1=echarts.init(document.getElementById('container1'));*/
         var echart1=echarts.init(document.getElementById('echartRegistration'));
+        var echart2=echarts.init(document.getElementById('echarts2'));
+        var echart3=echarts.init(document.getElementById('echarts3'));
+        var echart4=echarts.init(document.getElementById('echarts4'));
         /*var echart2=echarts.init(document.getElementById('container2'));
         var echart3=echarts.init(document.getElementById('container3'));
         var echart4=echarts.init(document.getElementById('container4'));*/
@@ -474,7 +477,8 @@
                 currentId.resize();
             });*/
         }
-        /*function echarts2(){
+        function echarts2(){
+            $("#echarts2-title").text(currentYear+'年年度');
             $.ajax({
                 url: prefix + '/echarts2',
                 type: 'POST',
@@ -490,22 +494,90 @@
                         ydata.push(e.value)
                     });
                     var option2 = {
-                        tooltip: {},
+                        calculable :false,
-                        xAxis: {
+                        grid:{
-                            data:xdata,
+                            left: '1%',
+                            right: '2%',
+                            bottom: '1%',
+                            top: '20%',
+                            containLabel: true
                         },
-                        yAxis: {
+
+                        tooltip : {
+                            axisPointer : {
+                                type : 'shadow'
+                            }
                         },
-                        legend:{
+                        xAxis: [{
+                            data: xdata,
+                            axisLabel: {
+                                show: true,
+                                rotate: '30',
+                                textStyle: {
+                                    color: 'rgba(0,0,0,.5)'
+                                }
+                            },
+                            splitLine: {
+                                lineStyle: {
+                                    width: 0,
+                                    type: 'solid'
+                                }
+                            },
+                            axisLine: {
+                                show: false,
+                            },
+                            axisTick: {
+                                show: false
+                            }
+                        }],
+                        yAxis: [{
+                            type : 'value',
+                            axisLabel: {
+                                show: true,
+                                textStyle: {
+                                    color: 'rgba(0,0,0,.5)'
+                                }
+                            },
+                            splitLine:{
+                                lineStyle:{
+                                    color:['#f2f2f2'],
+                                    width:1.5,
+                                    type:'solid',
+                                }
+                            },
+                            axisLine: {
+                                show: false,
+                            },
+                            axisTick: {
+                                show: false
+                            }
+                        }],
+                        /*legend:{
                             data:[currentYear+'年年度执法检查排行(TOP10)']
-                        },
+                        },*/
                         series:[
                             {
                                 name:currentYear+'年年度执法检查排行(TOP10)',
                                 data:ydata,
                                 type:'bar',
-                                color: "rgba(24, 116, 205, 1)",
+                                barWidth: 15,
-                                barWidth: 50
+                                barGap: 15,
+                                smooth: false,
+                                stack: '总量',
+                                itemStyle: {
+                                    emphasis: {
+                                        barBorderRadius: 0
+                                    },normal: {
+                                        barBorderRadius: 0,
+                                        color: new echarts.graphic.LinearGradient(
+                                            0, 0, 1, 0,
+                                            [
+                                                {offset: 0, color: '#3977E6'},
+                                                {offset: 1, color: '#37BBF8'}
+
+                                            ]
+                                        )
+                                    }},
                             }
                         ]
                     };
@@ -514,6 +586,7 @@
             })
         }
         function echarts3(){
+            $("#echarts3-title").text(currentYear+'年'+currentQuarter);
             $.ajax({
                 url: prefix + '/echarts3',
                 type: 'POST',
@@ -528,22 +601,91 @@
                         ydata.push(e.value)
                     });
                     var option3 = {
-                        tooltip: {},
+                        calculable :false,
-                        xAxis: {
+                        grid:{
-                            data:xdata,
+                            left: '1%',
+                            right: '2%',
+                            bottom: '1%',
+                            top: '20%',
+                            containLabel: true
                         },
-                        yAxis: {
+
+                        tooltip : {
+                            axisPointer : {
+                                type : 'shadow'
+                            }
                         },
-                        legend:{
+                        xAxis: [{
+                            data:xdata,
+                            axisLabel: {
+                                show: true,
+                                rotate: '30',
+                                textStyle: {
+                                    color: 'rgba(0,0,0,.5)'
+                                }
+                            },
+                            splitLine: {
+                                lineStyle: {
+                                    width: 0,
+                                    type: 'solid'
+                                }
+                            },
+                            axisLine: {
+                                show: false,
+                            },
+                            axisTick: {
+                                show: false
+                            }
+                        }],
+                        yAxis: [{
+                            type : 'value',
+                            axisLabel: {
+                                show: true,
+                                textStyle: {
+                                    color: 'rgba(0,0,0,.5)'
+                                }
+                            },
+                            splitLine:{
+                                lineStyle:{
+                                    color:['#f2f2f2'],
+                                    width:1.5,
+                                    type:'solid',
+                                }
+                            },
+                            axisLine: {
+                                show: false,
+                            },
+                            axisTick: {
+                                show: false
+                            }
+                        }],
+                        /*legend:{
                             data:[currentYear+'年'+currentQuarter+'执法检查排行(TOP10)']
-                        },
+                        },*/
                         series:[
                             {
-                                name:currentYear+'年'+currentQuarter+'执法检查排行(TOP10)',
+                                name: currentYear + '年' + currentQuarter + '执法检查排行(TOP10)',
-                                data:ydata,
+                                data: ydata,
-                                type:'bar',
+                                type: 'bar',
-                                color: "rgba(24, 116, 205, 1)",
+                                barWidth: 15,
-                                barWidth: 50
+                                barGap: 15,
+                                smooth: false,
+                                stack: '总量',
+                                itemStyle: {
+                                    emphasis: {
+                                        barBorderRadius: 0
+                                    }, normal: {
+                                        barBorderRadius: 0,
+                                        color: new echarts.graphic.LinearGradient(
+                                            0, 0, 1, 0,
+                                            [
+                                                {offset: 0, color: '#3977E6'},
+                                                {offset: 1, color: '#37BBF8'}
+
+                                            ]
+                                        )
+                                    }
+                                },
                             }
                         ]
                     };
@@ -552,6 +694,7 @@
             })
         }
         function echarts4(){
+            $("#echarts4-title").text(currentYear+'年'+currentMonth+'月');
             $.ajax({
                 url: prefix + '/echarts4',
                 type: 'POST',
@@ -566,29 +709,98 @@
                         ydata.push(e.value)
                     });
                     var option4 = {
-                        tooltip: {},
+                        calculable :false,
-                        xAxis: {
+                        grid:{
-                            data:xdata,
+                            left: '1%',
+                            right: '2%',
+                            bottom: '1%',
+                            top: '20%',
+                            containLabel: true
                         },
-                        yAxis: {
+
+                        tooltip : {
+                            axisPointer : {
+                                type : 'shadow'
+                            }
                         },
-                        legend:{
+                        xAxis: [{
+                            data:xdata,
+                            axisLabel: {
+                                show: true,
+                                rotate: '30',
+                                textStyle: {
+                                    color: 'rgba(0,0,0,.5)'
+                                }
+                            },
+                            splitLine: {
+                                lineStyle: {
+                                    width: 0,
+                                    type: 'solid'
+                                }
+                            },
+                            axisLine: {
+                                show: false,
+                            },
+                            axisTick: {
+                                show: false
+                            }
+                        }],
+                        yAxis: [{
+                            type : 'value',
+                            axisLabel: {
+                                show: true,
+                                textStyle: {
+                                    color: 'rgba(0,0,0,.5)'
+                                }
+                            },
+                            splitLine:{
+                                lineStyle:{
+                                    color:['#f2f2f2'],
+                                    width:1.5,
+                                    type:'solid',
+                                }
+                            },
+                            axisLine: {
+                                show: false,
+                            },
+                            axisTick: {
+                                show: false
+                            }
+                        }],
+                        /*legend:{
                             data:[currentYear+'年'+currentMonth+'月执法检查排行(TOP10)']
-                        },
+                        },*/
                         series:[
                             {
                                 name:currentYear+'年'+currentMonth+'月执法检查排行(TOP10)',
                                 data:ydata,
-                                type:'bar',
+                                type: 'bar',
-                                color: "rgba(24, 116, 205, 1)",
+                                barWidth: 15,
-                                barWidth: 50
+                                barGap: 15,
+                                smooth: false,
+                                stack: '总量',
+                                itemStyle: {
+                                    emphasis: {
+                                        barBorderRadius: 0
+                                    }, normal: {
+                                        barBorderRadius: 0,
+                                        color: new echarts.graphic.LinearGradient(
+                                            0, 0, 1, 0,
+                                            [
+                                                {offset: 0, color: '#3977E6'},
+                                                {offset: 1, color: '#37BBF8'}
+
+                                            ]
+                                        )
+                                    }
+                                },
                             }
                         ]
                     };
                     echart4.setOption(option4);
                 }
             })
-        }*/
+        }
 
         $(function() {
             var options2 = {
@@ -866,7 +1078,7 @@
 
         /*******2.年度计划TOP10********/
 
-        var myChart = echarts.init(document.getElementById('echarts2'));
+        /*var myChart = echarts.init(document.getElementById('echarts2'));
         var option = {
 
             color:["#2d4beb","#03a978",],
@@ -1011,7 +1223,7 @@
             myChart.resize();
         });
 
-        /*******3.季度计划TOP10********/
+        /!*******3.季度计划TOP10********!/
 
         var myChart = echarts.init(document.getElementById('echarts3'));
         var option = {
@@ -1207,7 +1419,7 @@
             myChart.resize();
         });
 
-        /*******4.月度计划TOP10********/
+        /!*******4.月度计划TOP10********!/
 
         var myChart = echarts.init(document.getElementById('echarts4'));
         var option = {
@@ -1281,10 +1493,10 @@
                         textStyle: {
                             color: 'rgba(0,0,0,.5)'
                         },
-                        /*formatter: (value) => {
+                        /!*formatter: (value) => {
                             const list = ['差', '较差', '','较好','', '好']
                             return list[value/20]
-                        }*/
+                        }*!/
                     },
 
                     splitLine:{
@@ -1597,7 +1809,7 @@
         myChart.setOption(option);
         window.addEventListener("resize",function(){
             myChart.resize();
-        });
+        });*/
     </script>
 </body>
 </html>

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

@@ -117,6 +117,7 @@
         var checkCategory=[[${@dict.getType('check_category')}]];
         var prefix = ctx + "code/registration";
         var searchType;
+        var currentYear = new Date().getFullYear();
         window.onload = function () {
             /*$("#quarter").hide();
             $("#month").hide();
@@ -340,10 +341,9 @@
             searchType=params;
             console.log(params);
             $("#bootstrap-table").bootstrapTable('refresh', params);
-            zhanbi();
+            /*zhanbi();*/
-
         }
-        function zhanbi (){
+        /*function zhanbi (){
             enforcementRegistration={
                 "lawEnforcement":searchType.lawEnforcement,
                 "lawEnforcer":searchType.lawEnforcer,
@@ -370,7 +370,7 @@
                     $('#a').html(response);
                 }
             })
-        }
+        }*/
         $(document).ready();
         function download1(){
             /*startTime=searchType.beginTime;

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

@@ -95,7 +95,9 @@ public class DeptStaticController extends BaseController {
         startPage();
         List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);
         for(int i=0;i<zfryjdm2405301List.size();i++){
-            zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0",zfryjdm2405301List.get(i).getPhoneNumber()));
+            if(zfryjdm2405301List.get(i).getPhoneNumber()!=null&&!"".equals(zfryjdm2405301List.get(i).getPhoneNumber())) {
+                zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", zfryjdm2405301List.get(i).getPhoneNumber()));
+            }
         }
         /*List<User> users=new ArrayList<>();
         for(User u:list){

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

@@ -52,6 +52,15 @@ public class EnforcementRegistrationDto extends BaseDomain {
      * 月度
      */
     private String month;
+    /**
+     * 开始时间
+     */
+    private String beginTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
 
 
     public String getEnterpriseName() {
@@ -149,4 +158,20 @@ public class EnforcementRegistrationDto extends BaseDomain {
     public void setMonth(String month) {
         this.month = month;
     }
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

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

@@ -574,6 +574,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="params.endTime != null and params.endTime != ''">
                     AND <![CDATA[  create_time <= #{params.endTime} ]]>
                 </if>
+                <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                    and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
+                </if>
+                <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                    and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
+                </if>
             </where>
             ORDER BY create_time DESC LIMIT 1000000000 ) t
         GROUP BY

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

@@ -12,11 +12,11 @@
     </resultMap>
 
     <select id="statisticalPanelDept" resultType="integer" parameterType="StatisticsIndicatorPart">
-        select count(id) from ZFZTJDM111915
+        select count(*) from (select * from ZFZTJDM111915 group by CODE) x
     </select>
 
     <select id="statisticalPanelUser" resultType="integer" parameterType="StatisticsIndicatorPart">
-        select count(id) from ZFRYJDM2405301 where CODE_STATE = '01'
+        select count(*) from (select * from ZFRYJDM2405301 where CODE_STATE = '01'and name is not null and zfdw is not null and zfcode is not null group by ZFCODE) x
     </select>
 
     <select id="statisticalPanelOneselfDeptUser" resultType="integer" parameterType="StatisticsIndicatorPart">

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

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <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 from zfryjdm2405301 z
-        left join sys_user s
+        left join (select * from sys_user where status='0' and del_flag='0' group by certificateNumber) s
         on z.sfzcode_encrypt=s.certificateNumber
         where z.code_state = '01'
         and z.name is not null
@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="name != null and name != ''">and z.name like concat('%',#{name},'%')</if>
         <if test="zfdw != null and zfdw != ''">and z.zfdw like concat('%',#{zfdw},'%')</if>
         <if test="zfcode != null and zfcode != ''">and z.zfcode like concat('%',#{zfcode},'%')</if>
+        group by z.sfzcode
     </select>
 
     <update id="updateZfryjdmSfzcodeByid" parameterType="Zfryjdm2405301">