统计分析

2 years ago · 2ad7e7678f
34 changed files with 1436 additions and 113 deletions
--- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java
+++ b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java
@ -29,13 +29,15 @@ public class IdCardCryptoUtil {
    public static final String PRIVATE_KEY = "MIICdAIBADANBgkqhkiG9w0BAQEFAASCAl4wggJaAgEAAoGBAMAMhV1Fc3JPmmYbFJR/AS6nZjVgLPtV+JszLJCGSlU/cHIqygUONnfTJbmC/vSxBuqf8wK2FMWrCHf8j9gt+2Eze9TtN2WY1+eUpxDqmvFih8uRfxqSuGBBUV6tv/gOFxsCTnG/HXYOR6H+fMN/lDDYrcLKZE+evjM3pmMAvv0fAgMBAAECf2rTWPVVrHuC/ywzFz+CmSXAxLNSZbMCH0doYvs0hIrmvtjCjgN1F6P1z2yUpHBEbsetZEwdyQnEf74+WCuBaFIYjmQm/05grIxam/QrGibnV5qNiA0VeCkj6bUy+z5mt3/ithgzjmOiYIgMenjf6ut6RmgRDodgJiFbvSvfskECQQDoqGMNaUV+Y/O9h+l9eOCkSUOjOsL9WDRL34ei/jf7VFFYBZLs2GMzLunDkDz1dHvufDiMPeHUTTN8zIEEpNMVAkEA01Ehf9Np2zUqFQp3SW/fHVsaGM97JsbsTQrsDdUWwZLJTSQ7Yf+yg21GkNa8Mmlsp1OLyS607HV7lPlKO0LsYwJBAN1LTOv0taUCbVRZcj1mPEYHac5Ylh9jRlrkwp7GL3lfOf//TUD6kWCdvrvE9jaCFV9ByIecVLEavV53JkDEhgECQHgR40z0XXOWs8Cc38a0cDwH5b4vNjSEVwQ3roT1jSaUNxlD+xHl7hLLZosp2Gl0ia5RxF2d0mOBJaUyOMGPdy0CQCLBU3995JMoUyLgt2+Riw0PFbdxFEnKGyshAt5Q957/hC6L/V5tQNnh/AM9q23DIUQGb1whhxdIzV12qFSSS34=";

    public static void main(String[] args) {
-
+        //VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0
+        //VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0
+        //SXRpWEhVN3RHM3ZFbzRQcQ==
        String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "1608644307579883522");
        String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "汪鑫");

 //        String secret = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "ae739d8c-86ed-4898-b57d-eed3be42debf");
 //        String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "3qQTst9aURL3pN5EzKtqVJnQv2Q0Ob3r+Gc9DXX/I30=");
-        String phone = IdCardCryptoUtil.symmetricDecryptIdCard("SXRpWEhVN3RHM3ZFbzRQcQ==", "vwU93AXzhBunLzjrILc3Ew==");
+        String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "AoQTc5m7o+maPsiYiikzYA==");

 //        System.out.println(userIdCode);
        System.out.println(phone);
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
@ -110,7 +110,7 @@

    <select id="selectUserList" parameterType="User" resultMap="UserResult">
        select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
-        u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.type, d.dept_name, u.law_certificate_num,
+        u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.type, d.dept_name, u.law_certificate_num,u.certificateNumber,
        d.leader,u.tenant_code,t.tenant_code, t.tenant_name, t.contact_man, t.contact_number, t.address
        from sys_user u
        left join sys_dept d on u.dept_id = d.dept_id
@ -145,6 +145,9 @@
            AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET
            (#{deptId},ancestors) ))
        </if>
+          <if test="lawCertificateNum!= null and lawCertificateNum != ''">
+              AND u.law_certificate_num like concat('%', #{lawCertificateNum}, '%')
+          </if>
        <!-- 租户数据过滤 -->
        <if test="tenantCode != @com.zdxt.auth.common.constant.Constants@DEFAULT_TENANT_CODE and tenantCode != null and tenantCode != ''">
            AND u.tenant_code = #{tenantCode}
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html
@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <div id="complaintA" th:fragment="complaintA">
+        <form id="formId">
+            <div class="select-list">
+                <ul>
+                    <li>
+                        <p>投诉对象：</p>
+                        <input type="text" name="zfdw"/>
+                    </li>
+                    <li>
+                        <p>投诉类型：</p>
+                        <select name="checkCss" th:with="type=${@dict.getType('caseType')}">
+                            <option value="">所有</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                    </li>
+                    <li>
+                        <p>时段：</p>
+                        <select id="year" name="year">
+                            <option value="">所有</option>
+                            <option value="2024">2024</option>
+                        </select>
+                        <select id="dateSearch" name="dateSearch" onchange="timeType()" >
+                            <option value="">所有</option>
+                            <option value="year">年度</option>
+                            <option value="quarter">季度</option>
+                            <option value="month">月度</option>
+                        </select>
+                        <select id="quarter" name="quarter">
+                            <option value="">所有</option>
+                            <option value="1">第一季度</option>
+                            <option value="2">第二季度</option>
+                            <option value="3">第三季度</option>
+                            <option value="4">第四季度</option>
+                        </select>
+                        <select id="month" name="month">
+                            <option value="">所有</option>
+                            <option value="01">1月</option>
+                            <option value="02">2月</option>
+                            <option value="03">3月</option>
+                            <option value="04">4月</option>
+                            <option value="05">5月</option>
+                            <option value="06">6月</option>
+                            <option value="07">7月</option>
+                            <option value="08">8月</option>
+                            <option value="09">9月</option>
+                            <option value="10">10月</option>
+                            <option value="11">11月</option>
+                            <option value="12">12月</option>
+                        </select>
+                    </li>
+                    <li>
+                        <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                        <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                        <a class="btn btn-download btn-rounded btn-sm" onclick="download1()"><i class="fa fa-download"></i>下载</a>
+                    </li>
+                </ul>
+            </div>
+        </form>
+        <div class="col-sm-12 select-table table-bordered">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</head>
+<body>
+<script>
+    window.onload = function () {
+        $("#quarter").hide();
+        $("#month").hide();
+    }
+</script>
+</body>
+</html>
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
@ -0,0 +1,285 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('执法投诉统计')"/>
+    <link type="text/css" href="/css/stat1.css" rel="stylesheet"/>
+    <style>
+        .tab-content {
+            display: none;
+        }
+
+        .tab-content.active {
+            display: block;
+        }
+    </style>
+</head>
+<body>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <div class="statit">
+                <span id="one1" class="actit" onclick="setTab('one',1,2)">执法投诉统计</span>
+                <span id="one2" onclick="setTab('one',2,2)">投诉类型统计</span>
+            </div>
+            <div id="one-tab1" class="tab-content active">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <p>投诉对象：</p>
+                                <input type="text" name="zfdw"/>
+                            </li>
+                            <li>
+                                <p>投诉类型：</p>
+                                <select name="checkCss" th:with="type=${@dict.getType('caseType')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>时段：</p>
+                                <select id="year" name="year">
+                                    <option value="2024">2024</option>
+                                </select>
+                                <select id="dateSearch" name="dateSearch" onchange="timeType1()" >
+                                    <option value="year">年度</option>
+                                    <option value="quarter">季度</option>
+                                    <option value="month">月度</option>
+                                </select>
+                                <select id="quarter" name="quarter">
+                                    <option value="">所有</option>
+                                    <option value="1">第一季度</option>
+                                    <option value="2">第二季度</option>
+                                    <option value="3">第三季度</option>
+                                    <option value="4">第四季度</option>
+                                </select>
+                                <select id="month" name="month">
+                                    <option value="">所有</option>
+                                    <option value="01">1月</option>
+                                    <option value="02">2月</option>
+                                    <option value="03">3月</option>
+                                    <option value="04">4月</option>
+                                    <option value="05">5月</option>
+                                    <option value="06">6月</option>
+                                    <option value="07">7月</option>
+                                    <option value="08">8月</option>
+                                    <option value="09">9月</option>
+                                    <option value="10">10月</option>
+                                    <option value="11">11月</option>
+                                    <option value="12">12月</option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-download btn-rounded btn-sm" onclick="complaintDownload1()"><i class="fa fa-download"></i>下载</a>
+                            </li>
+                            <ul>
+                                <li id="complaintA" th:fragment="complaintA">
+                                    <p th:text="|${year}年|"></p>
+                                    <p th:text="|投诉数量  ${Number1}|"></p>
+                                    <p th:text="|投诉对象  ${Number1}|"></p>
+                                </li>
+                            </ul>
+                        </ul>
+                    </div>
+                </form>
+                <div class="col-sm-12 select-table table-bordered">
+                    <table id="bootstrap-table1"></table>
+                </div>
+            </div>
+            <div id="one-tab2" class="tab-content">
+                <form id="formId2">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <p>时段：</p>
+                                <select id="year2" name="year">
+                                    <option value="2024">2024</option>
+                                </select>
+                                <select id="dateSearch2" name="dateSearch" onchange="timeType2()" >
+                                    <option value="year">年度</option>
+                                    <option value="quarter">季度</option>
+                                    <option value="month">月度</option>
+                                </select>
+                                <select id="quarter2" name="quarter">
+                                    <option value="">所有</option>
+                                    <option value="1">第一季度</option>
+                                    <option value="2">第二季度</option>
+                                    <option value="3">第三季度</option>
+                                    <option value="4">第四季度</option>
+                                </select>
+                                <select id="month2" name="month">
+                                    <option value="">所有</option>
+                                    <option value="01">1月</option>
+                                    <option value="02">2月</option>
+                                    <option value="03">3月</option>
+                                    <option value="04">4月</option>
+                                    <option value="05">5月</option>
+                                    <option value="06">6月</option>
+                                    <option value="07">7月</option>
+                                    <option value="08">8月</option>
+                                    <option value="09">9月</option>
+                                    <option value="10">10月</option>
+                                    <option value="11">11月</option>
+                                    <option value="12">12月</option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-success btn-rounded btn-sm" onclick="search2('form',2)"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-download btn-rounded btn-sm" onclick="complaintDownload2()"><i class="fa fa-download"></i>下载</a>
+                            </li>
+                        </ul>
+                        <ul>
+                            <li id="complaintB" th:fragment="complaintB">
+                                <p th:text="|${year}年|"></p>
+                                <p th:text="|投诉数量  ${Number3}|"></p>
+                            </li>
+                        </ul>
+                    </div>
+
+                </form>
+                <div class="col-sm-12 select-table table-bordered">
+                    <table id="bootstrap-table2" style="width: 550px"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+    <th:block th:include="zdxtInclude :: footer"/>
+    <script th:inline="javascript">
+        var prefix = ctx + "code/complaintStatic";
+        window.onload = function () {
+            $("#A").hide();
+            $("#quarter").hide();
+            $("#month").hide();
+            $("#quarter2").hide();
+            $("#month2").hide();
+        }
+        $(function() {
+            var options1 = {
+                url: prefix + "/list1",
+                modalName: "执法投诉统计",
+                showHeader: true,
+                showFooter: false,
+                showColumns: false,
+                showRefresh: false,
+                showToggle: false,
+                //quarterBoolean:quarterBoolean,
+                columns: [
+                    {
+                        field : 'enterpriseName',
+                        title : '投诉对象'
+                    },
+                    {
+                        field : 'numInt',
+                        title : '投诉类型'
+                    },
+                    {
+                        field : 'lawEnforcementItemText',
+                        title : '投诉数量'
+                    },
+                ]
+            };
+            $("#bootstrap-table1").bootstrapTable(options1);
+        });
+        $(function() {
+            var options2 = {
+                url: prefix + "/list2",
+                modalName: "投诉类型统计",
+                showHeader: true,
+                showFooter: false,
+                showColumns: false,
+                showRefresh: false,
+                showToggle: false,
+                //quarterBoolean:quarterBoolean,
+                columns: [
+                    {
+                        field : 'name',
+                        title : '投诉类型'
+                    },
+                    {
+                        field : 'numInt',
+                        title : '投诉数量'
+                    },
+                    {
+                        field : 'percentage',
+                        title : '占比'
+                    },
+                ]
+            }
+            $("#bootstrap-table2").bootstrapTable(options2);
+        });
+        function setTab(prefix, num, total) {
+            console.log( document.getElementById(`${prefix}1`))
+            for (let i = 1; i <= total; i++) {
+                document.getElementById(`${prefix}${i}`).classList.remove('actit');
+                document.getElementById(`${prefix}-tab${i}`).classList.remove('active');
+            }
+            document.getElementById(`${prefix}${num}`).classList.add('actit');
+            document.getElementById(`${prefix}-tab${num}`).classList.add('active');
+        }
+        function search2 (prefix,n) {
+            /*var currentId = $.common.isEmpty(formId) ? $('form').eq(1).attr('id') : formId2;*/
+            var currentId=$('form').eq(n-1).attr('id')
+            console.log(currentId);
+            var params = $.common.formToJSON(currentId);
+            searchType=params;
+            console.log(params);
+            $('#bootstrap-table'+n).bootstrapTable('refresh', params);
+        }
+        function timeType1() {
+            var dateSearch = document.getElementById("dateSearch");
+            console.log(dateSearch.value)
+            if(dateSearch.value=="quarter"){
+                $("#quarter").show();
+                $("#month").hide();
+            }else if(dateSearch.value=="month"){
+                $("#quarter").hide();
+                $("#month").show();
+            }else {
+                $("#quarter").hide();
+                $("#month").hide();
+            }
+        }
+        function timeType2() {
+            var dateSearch = document.getElementById("dateSearch2");
+            console.log(dateSearch.value)
+            if(dateSearch.value=="quarter"){
+                $("#quarter2").show();
+                $("#month2").hide();
+            }else if(dateSearch.value=="month"){
+                $("#quarter2").hide();
+                $("#month2").show();
+            }else {
+                $("#quarter2").hide();
+                $("#month2").hide();
+            }
+        }
+        function complaintDownload1(){
+            let table=document.getElementById('bootstrap-table1');
+            let html=table.outerHTML;
+            let downloadLink=document.createElement("a");
+            document.body.append(downloadLink);
+            downloadLink.href='data:application/vnd.ms-excel,'+ encodeURIComponent(html);
+            downloadLink.download='执法投诉统计.xls';
+            downloadLink.click();
+        }
+        function complaintDownload2(){
+            let table=document.getElementById('bootstrap-table2');
+            console.log(table);
+            let html=table.outerHTML;
+            let downloadLink=document.createElement("b");
+            document.body.append(downloadLink);
+            downloadLink.href='data:application/vnd.ms-excel,'+ encodeURIComponent(html);
+            downloadLink.download='投诉类型统计.xls';
+            downloadLink.click();
+        }
+    </script>
+</body>
+</html>
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html
@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('执法部门统计')"/>
+    <link type="text/css" href="/css/stat1.css" rel="stylesheet"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <p>执法部门：</p>
+                            <input type="text" name="zfdw"/>
+                        </li>
+                        <li>
+                            <p>执法人员：</p>
+                            <input type="text" name="name"/>
+                        </li>
+                        <li>
+                            <p>执法证号</p>
+                            <input type="text" name="zfcode"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            <a class="btn btn-download btn-rounded btn-sm" onclick="download1()"><i class="fa fa-download"></i>下载</a>
+                        </li>
+                    </ul>
+                    <ul>
+                        <li id="b" th:fragment="b">
+                            <p th:text="|全市:执法部门 ${deptNumber}  执法人员 ${lawNumber}|"></p>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+        <div class="col-sm-12 select-table table-bordered">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="zdxtInclude :: footer" />
+<script th:inline="javascript">
+    var prefix = ctx + "code/deptStatic";
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            detailUrl: prefix + "/detail/{id}",
+            exportUrl: prefix + "/export",
+            modalName: "执法部门统计",
+            showHeader: false,
+            showFooter: false,
+            showColumns: false,
+            showRefresh: false,
+            showToggle: false,
+            //quarterBoolean:quarterBoolean,
+            columns: [
+                /*{
+                checkbox: false
+                },*/
+                /*{
+                    field : 'id',
+                    title : '主键ID',
+                    visible: false
+                },*/
+                {
+                    field : 'zfdw',
+                    title : '执法部门'
+                },
+                {
+                    field : 'name',
+                    title : '执法人员',
+                },
+                {
+                    field : 'zfcode',
+                    title : '执法证号'
+                },
+                {
+                    field : 'phoneNumber',
+                    title : '联系方式'
+
+                }
+            ]
+        };
+        $.table.init(options);
+    });
+    function download1(){
+        let table=document.getElementById('bootstrap-table');
+        let html=table.outerHTML;
+        let downloadLink=document.createElement("a");
+        document.body.append(downloadLink);
+        downloadLink.href='data:application/vnd.ms-excel,'+ encodeURIComponent(html);
+        downloadLink.download='执法部门统计.xls';
+        downloadLink.click();
+    }
+</script>
+</body>
+</html>
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/fragmentB.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/fragmentB.html
@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <li id="b" th:fragment="b">
+        <p th:text="|全市:执法部门 ${deptNumber}  执法人员 ${lawNumber}|"></p>
+    </li>
+</head>
+<body>
+
+</body>
+</html>
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/detail.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/detail.html
@ -70,7 +70,7 @@
        <div class="form-group">
            <label class="col-sm-2 control-label">执法事项：</label>
            <div class="col-sm-10">
-                <textarea name="lawEnforcementItem" class="form-control">[[*{lawEnforcementItem}]]</textarea>
+                <textarea name="lawEnforcementItem" class="form-control">[[*{lawEnforcementItemText}]]</textarea>
            </div>
        </div>
        <div class="form-group">
@ -80,14 +80,31 @@
            </div>
        </div>
        <div class="form-group">
-            <label class="col-sm-2 control-label">执法结果：</label>
+            <label class="col-sm-2 control-label">是否投诉：</label>
            <div class="col-sm-4">
-                <select  class="form-control m-b" name="reslut" th:field="*{reslut}" >
+                <select  class="form-control m-b" name="isComplaint" th:field="*{isComplaint}" >
                    <option value="0">合格</option>
                    <option value="1">不合格</option>
                </select>
            </div>
        </div>
+        <div class="form-group">
+            <label class="col-sm-2 control-label">联合检查：</label>
+            <div class="col-sm-4">
+                <select  class="form-control m-b" name="uniteCheck" th:field="*{uniteCheck}" >
+                    <option value="0">是</option>
+                    <option value="1">否</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-2 control-label">行政检查类别：</label>
+            <div class="col-sm-4">
+                <select  class="form-control m-b" th:with="type=${@dict.getType('check_category')}" name="checkCategory" th:field="*{checkCategory}" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+        </div>
    </form>
 </div>
 <th:block th:include="zdxtInclude :: footer" />
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html
@ -21,9 +21,9 @@
                </div>
            </div>
            <div class="form-group">    
-                <label class="col-sm-3 control-label">被执法企业ID：</label>
+                <label class="col-sm-3 control-label">被执法企业税号：</label>
                <div class="col-sm-8">
-                    <input name="enterpriseId" th:field="*{enterpriseId}" class="form-control" type="text">
+                    <input name="enterpriseId" th:field="*{enterpriseNumber}" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
@ -43,7 +43,7 @@
                <div class="col-sm-8">
                    <div class="input-group date">
                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="enforcementTime" th:value="${#dates.format(enforcementRegistration.enforcementTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input name="createTime" th:value="${#dates.format(enforcementRegistration.createTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                    </div>
                </div>
            </div>
@ -104,7 +104,7 @@
            <div class="form-group">
                <label class="col-sm-3 control-label">执法事项：</label>
                <div class="col-sm-8">
-                    <textarea name="lawEnforcementItem" class="form-control">[[*{lawEnforcementItem}]]</textarea>
+                    <textarea name="lawEnforcementItemText" class="form-control">[[*{lawEnforcementItemText}]]</textarea>
                </div>
            </div>
            <div class="form-group">
@ -132,9 +132,21 @@
                </div>
            </div>
            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否删除 0 否 1 是：</label>
+                <label class="col-sm-3 control-label">是否投诉 0 否 1 是：</label>
+                <div class="col-sm-8">
+                    <input name="isComplaint" th:field="*{isComplaint}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">联合检查 0 否 1 是：</label>
+                <div class="col-sm-8">
+                    <input name="uniteCheck" th:field="*{uniteCheck}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">行政检查类别</label>
                <div class="col-sm-8">
-                    <input name="isDelete" th:field="*{isDelete}" class="form-control" type="text">
+                    <input name="checkCategory" th:field="*{checkCategory}" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
@ -169,7 +181,7 @@
            }
        }

-        $("input[name='enforcementTime']").datetimepicker({
+        $("input[name='createTime']").datetimepicker({
            format: "yyyy-mm-dd",
            minView: "month",
            autoclose: true
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html
@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+  <li th:fragment="a">
+    <p th:text="|联合检查  ${unite}|"></p>
+    <p th:text="|占比  ${uniteDouble}|"></p>
+    <p th:text="|${check}  ${checkNumber}|"></p>
+    <p th:text="|占比  ${checkDouble}|"></p>
+  </li>
+</head>
+<body>
+
+</body>
+</html>
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
@ -18,22 +18,97 @@
                                <p>执法人员：</p>
                                <input type="text" name="lawEnforcer"/>
                            </li>
-<!--                            <li>-->
-<!--                                <p>执法类型：</p>-->
-<!--                                <select>-->
-<!--                                    <option value="1">执法类型1</option>-->
-<!--                                    <option value="2">执法类型2</option>-->
-<!--                                </select>-->
-<!--                            </li>-->
+                            <li>
+                                <p>企业名称：</p>
+                                <input type="text" name="enterpriseName"/>
+                            </li>
+                            <li>
+                                <p>检查事项：</p>
+                                <input type="text" name="lawEnforcementItemText"/>
+                            </li>
+                            <li>
+                                <p>联合检查：</p>
+                                <select id="uniteCheck" name="uniteCheck" onchange="">
+                                    <option value="">所有</option>
+                                    <option value="0">否</option>
+                                    <option value="1">是</option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>检查类别：</p>
+                                <select id="checkCategory" name="checkCategory" th:with="type=${@dict.getType('check_category')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>是否投诉：</p>
+                                <select id="isComplaint" name="isComplaint">
+                                    <option value="">所有</option>
+                                    <option value="0">否</option>
+                                    <option value="1">是</option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>扫码原因：</p>
+                                <select name="checkCss" th:with="type=${@dict.getType('no-scan-reason')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>时段：</p>
+                                <select id="year" name="year">
+                                    <option value="">所有</option>
+                                    <option value="2024">2024</option>
+                                </select>
+                                <select id="dateSearch" name="dateSearch" onchange="timeType()" >
+                                    <option value="">所有</option>
+                                    <option value="year">年度</option>
+                                    <option value="quarter">季度</option>
+                                    <option value="month">月度</option>
+                                </select>
+                                <select id="quarter" name="quarter">
+                                    <option value="">所有</option>
+                                    <option value="1">第一季度</option>
+                                    <option value="2">第二季度</option>
+                                    <option value="3">第三季度</option>
+                                    <option value="4">第四季度</option>
+                                </select>
+                                <select id="month" name="month">
+                                    <option value="">所有</option>
+                                    <option value="01">1月</option>
+                                    <option value="02">2月</option>
+                                    <option value="03">3月</option>
+                                    <option value="04">4月</option>
+                                    <option value="05">5月</option>
+                                    <option value="06">6月</option>
+                                    <option value="07">7月</option>
+                                    <option value="08">8月</option>
+                                    <option value="09">9月</option>
+                                    <option value="10">10月</option>
+                                    <option value="11">11月</option>
+                                    <option value="12">12月</option>
+                                </select>
+                            </li>
                            <li class="select-time">
                                <p>检查时间：</p>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginEnforcementTime]"/>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endEnforcementTime]"/>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
                            </li>
                            <li>
-                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-success btn-rounded btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                <a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-download btn-rounded btn-sm" onclick="download1()"><i class="fa fa-download"></i>下载</a>
+                            </li>
+                        </ul>
+                        <ul>
+                            <li id="a" th:fragment="a">
+                                <p th:text="|联合检查  ${unite}|"></p>
+                                <p th:text="|占比  ${uniteDouble}|"></p>
+                                <p th:text="|${check}  ${checkNumber}|"></p>
+                                <p th:text="|占比  ${checkDouble}|"></p>
                            </li>
                        </ul>
                    </div>
@ -61,8 +136,22 @@
        var editFlag = [[${@permission.hasPermi('code:registration:edit')}]];
        var removeFlag = [[${@permission.hasPermi('code:registration:remove')}]];
        var detailFlag = [[${@permission.hasPermi('code:registration:datail')}]];
+        var checkCategory=[[${@dict.getType('check_category')}]];
        var prefix = ctx + "code/registration";
-
+        var quarterBoolean=/*[[${quarterBoolean}]]*/{};
+        var monthBoolean=/*[[${monthBoolean}]]*/{};
+        var unite=/*[[${unite}]]*/{};
+        var uniteDouble=/*[[${uniteDouble}]]*/{};
+        var check=/*[[${check}]]*/{};
+        var checkNumber=/*[[${checkNumber}]]*/{};
+        var checkDouble=/*[[${checkDouble}]]*/{};
+        var searchType;
+        //console.log(uniteNumber);
+        //console.log(checkCategory);
+        window.onload = function () {
+            $("#quarter").hide();
+            $("#month").hide();
+        }
        $(function() {
            var options = {
                url: prefix + "/list",
@ -77,92 +166,232 @@
                showColumns: false,
                showRefresh: false,
                showToggle: false,
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field : 'id', 
-                    title : '主键ID',
-                    visible: false
-                },
-                {
-                    field : 'lawEnforcementCode',
-                    title : '登记编号'
-                },
-                {
-                    field : 'lawEnforcement', 
-                    title : '执法部门'
-                },
-                {
-                    field : 'enterpriseName', 
-                    title : '企业名称'
-                },
-                {
-                    field : 'enterpriseNumber', 
-                    title : '企业税号'
-                },
-                {
-                    field : 'enforcementTime', 
-                    title : '执法时间'
-                },
-                {
-                    field : 'lawEnforcer', 
-                    title : '执法人员姓名',
-                    formatter:function (value,row,index) {
-                        return value + ( row.lawEnforcerTwo != "" && row.lawEnforcerTwo !=null? "," + row.lawEnforcerTwo : "");
-                    }
-                },
-                {
-                    field : 'lawEnforcerTel', 
-                    title : '执法人员联系方式',
-                    formatter:function (value,row,index) {
-                        return (value != null && value != "" ? value : "")  +
-                            ( row.lawEnforcerTelTwo != "" && row.lawEnforcerTelTwo !=null? "," + row.lawEnforcerTelTwo : "");
-                    }
-                },
-                // {
-                //     field : 'subsidiaryer',
-                //     title : '辅助人员姓名',
-                //     formatter:function (value,row,index) {
-                //         return value;
-                //     }
-                // },
-                // {
-                //     field : 'subsidiaryerTel',
-                //     title : '辅助人员联系方式'
-                // },
-                {
-                    field : 'lawEnforcementItemText',
-                    title : '执法事项'
-                },
-                {
-                    field : 'lawEnforcementBasisText',
-                    title : '执法依据'
-                },
-                {
-                    field : 'reslut', 
-                    title : '执法结果',
-                    formatter:function (value,row,index) {
-                        if(value == 0){
-                            return "<span style='color: green'>合格</span>";
-                        }else{
-                            return "<span style='color: red'>不合格</span>";
+                //quarterBoolean:quarterBoolean,
+                columns: [
+                    /*{
+                    checkbox: false
+                    },*/
+                    /*{
+                        field : 'id',
+                        title : '主键ID',
+                        visible: false
+                    },*/
+                    {
+                        field : 'lawEnforcement',
+                        title : '执法部门'
+                    },
+                    {
+                        field : 'lawEnforcement',
+                        title : '执法人员',
+                        formatter:function (value,row,index) {
+                            name="";
+                            if(row.lawEnforcer!=""&&row.lawEnforcer!=null){
+                                name=row.lawEnforcer;
+                            }
+                            if(row.lawEnforcer!=""&&row.lawEnforcer!=null&&row.lawEnforcerTwo!=""&&row.lawEnforcerTwo!=null){
+                                name=name+",";
+                            }
+                            if(row.lawEnforcerTwo!=""&&row.lawEnforcerTwo!=null){
+                                name=name+row.lawEnforcerTwo;
+                            }
+                            return name;
+                        }
+                    },
+                    {
+                        field : 'enterpriseName',
+                        title : '企业名称'
+                    },
+                    {
+                        field : 'lawEnforcementItemText',
+                        title : '检查事项'
+                    },
+                    {
+                        field : 'uniteCheck',
+                        title : '联合检查',
+                        formatter:function (value,row,index) {
+                            if(value == "1"){
+                                return "<span>是</span>";
+                            }else{
+                                return "<span>否</span>";
+                            }
+                        }
+                    },
+                    {
+                        field : 'checkCategory',
+                        title : '行政检查类别',
+                        formatter:function (value,row,index) {
+                            for(i=0;i<checkCategory.length;i++){
+                                if(checkCategory[i].dictValue==row.checkCategory){
+                                    return checkCategory[i].dictLabel;
+                                }
+                            }
+                            /*switch (row.checkCategory) {
+                                case "1":
+                                    return "日常检查";
+                                case "2":
+                                    return "专项检查";
+                                case "3":
+                                    return "上级交办";
+                                case "4":
+                                    return "投诉举报";
+                                case "9":
+                                    return "其他";
+                                default:
+                                    return"";
+                            }*/
+                        }
+                    },
+                    {
+                        field : 'checkCss',
+                        title : '是否扫码',
+                        formatter:function (value,row,index) {
+                            if(value == 0){
+                                return "<span>是</span>";
+                            }else{
+                                return "<span>否</span>";
+                            }
+                        }
+                    },
+                    {
+                        field : 'isComplaint',
+                        title : '是否投诉',
+                        formatter:function (value,row,index) {
+                            if(value == 0){
+                                return "<span>否</span>";
+                            }else{
+                                return "<span>是</span>";
+                            }
+                        }
+                    },
+                    {
+                        field : 'createTime',
+                        title : '检查时间'
+                    },
+                    {
+                        title: '操作',
+                        align: 'center',
+                        formatter: function(value, row, index) {
+                            var actions = [];
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class="btn btn-danger btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i>详情</a>');
+                            return actions.join('');
                        }
                    }
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i>详情</a>');
-                        return actions.join('');
-                    }
-                }]
+                ]
            };
            $.table.init(options);
        });
+        function timeType() {
+            var dateSearch = document.getElementById("dateSearch");
+            console.log(dateSearch.value)
+            if(dateSearch.value=="quarter"){
+                $("#quarter").show();
+                $("#month").hide();
+            }else if(dateSearch.value=="month"){
+                $("#quarter").hide();
+                $("#month").show();
+            }else {
+                $("#quarter").hide();
+                $("#month").hide();
+            }
+        }
+        function search1 (formId) {
+            var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
+            console.log(currentId);
+            var params = $.common.formToJSON(currentId);
+            searchType=params;
+            console.log(params);
+            $("#bootstrap-table").bootstrapTable('refresh', params);
+            zhanbi();
+
+        }
+        function zhanbi (){
+            enforcementRegistration={
+                "lawEnforcement":searchType.lawEnforcement,
+                "lawEnforcer":searchType.lawEnforcer,
+                "enterpriseName":searchType.enterpriseName,
+                "lawEnforcementItemText":searchType.lawEnforcementItemText,
+                "uniteCheck":searchType.uniteCheck,
+                "checkCategory":searchType.checkCategory,
+                "isComplaint":searchType.isComplaint,
+                "checkCss":searchType.checkCss,
+                "year":searchType.year,
+                "dateSearch":searchType.dateSearch,
+                "quarter":searchType.quarter,
+                "month":searchType.month,
+                "beginTime":searchType.beginTime,
+                "endTime":searchType.endTime,
+            }
+            $.ajax({
+                url:prefix+'/searchType',
+                type:'GET',
+                data:searchType,
+                success: function (response) {
+                    console.log(check)
+                    console.log('317'+response)
+                    $('#a').html(response);
+                }
+            })
+        }
+        $(document).ready()
+        function download1(){
+            /*startTime=searchType.beginTime;
+            endTime=searchType.endTime;*/
+            /*$.ajax({
+                url:ctx+"enforcementCheckStatistics/queryAllList/"+startTime+"/"+endTime,
+                type:'GET',
+                success: function (data) {
+                    console.log('329'+data)
+                }
+            })*/
+            /*this.download('/export',{
+                ...this.queryParameters
+            },`registration.xlsx`)*/
+            //$.operate.get(ctx+"enforcementCheckStatistics/queryAllList", { "startTime": searchType.beginTime, "endTime": searchType.endTime });
+            let table=document.getElementById('bootstrap-table');
+            //let html=table.outerHTML;
+            let newTableHtml='<table><thead><tr>';
+            let headers = table.querySelectorAll('thead tr th');
+            headers.forEach((header, index) => {
+                console.log(header,index);
+                console.log(index !== 9);
+                if (index !== 9) {
+                    newTableHtml += `<th>${header.innerText}</th>`;
+                }
+            });
+            newTableHtml += '</tr></thead><tbody>';
+            let rows = table.querySelectorAll('tbody tr');
+            rows.forEach(row => {
+                newTableHtml += '<tr>';
+                let cells = row.querySelectorAll('td');
+                cells.forEach((cell, index) => {
+                    if (index !== 9) {
+                        newTableHtml += `<td>${cell.innerText}</td>`;
+                    }
+                });
+                newTableHtml += '</tr>';
+            });
+            newTableHtml += '</tbody></table>';
+            let downloadLink=document.createElement("a");
+            //document.body.append(downloadLink);
+            downloadLink.href='data:application/vnd.ms-excel,'+ encodeURIComponent(newTableHtml);
+            document.body.appendChild(downloadLink);
+            downloadLink.download='执法检查统计.xls';
+            downloadLink.click();
+            document.body.removeChild(downloadLink);
+        }
+        /*var table=document.getElementById('bootstrap-table');
+        var rows=table.rows;
+        var data1=[];
+        for(var i=0;i<rows.length;i++){
+            var rowData=[];
+            for(var j=0;j<rows[i].cells.length;j++){
+                rowData.push(rows[i].cells[j].innerText);
+            }
+            data1.push(rowData)
+        }
+        var encodedUri=encodeURI(csvContent);
+        var link=do*/
    </script>
 </body>
 </html>
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java
@ -0,0 +1,116 @@
+package com.zdxt.code.controller;
+
+import com.zdxt.auth.project.system.dict.mapper.DictDataMapper;
+import com.zdxt.code.domain.EnterpriseComplaint;
+import com.zdxt.code.domain.SearchType;
+import com.zdxt.code.domain.StatisticsIndicator;
+import com.zdxt.code.service.IEnterpriseComplaintService;
+import com.zdxt.common.controller.BaseController;
+import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.domain.auth.DictData;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.stream.Collectors;
+
+@Controller
+@RequestMapping("/code/complaintStatic")
+public class ComplaintStaticController extends BaseController {
+    @Autowired
+    private IEnterpriseComplaintService iEnterpriseComplaintService;
+    @Autowired
+    private DictDataMapper dictDataMapper;
+    private String prefix = "project/code/complaintStatic";
+    DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    LocalDate localDate=LocalDate.now();
+    @RequiresPermissions("code:complaintStatic:view")
+    @GetMapping()
+    public String complaintStatic(Model model) {
+        model.addAttribute("year",2024);
+        model.addAttribute("Number1","");
+        model.addAttribute("Number2","");
+        model.addAttribute("Number3",iEnterpriseComplaintService.selectEnterpriseComplaint(null).size());
+        return prefix+"/complaintStatic";
+    }
+
+    @RequiresPermissions("code:complaintStatic:list")
+    @PostMapping("/list2")
+    @ResponseBody
+    public TableDataInfo complaint(SearchType searchType) {
+        if(searchType.getYear()==null||!"".equals(searchType.getYear())){
+            searchType.setYear(localDate.getYear()+"");
+        }
+        EnterpriseComplaint enterpriseComplaint=new EnterpriseComplaint();
+        if(searchType.getMonth()!=null&&!"".equals(searchType.getMonth())){
+            LocalDate beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(Integer.valueOf(searchType.getMonth())).withDayOfMonth(1);
+            LocalDate endTime = beginTime.with(TemporalAdjusters.lastDayOfMonth());
+            enterpriseComplaint.setBeginTime(str.format(beginTime));
+            enterpriseComplaint.setEndTime(str.format(endTime));
+        }else if(searchType.getQuarter()!=null&&!"".equals(searchType.getQuarter())){
+            LocalDate beginTime=LocalDate.now();
+            LocalDate endTime=LocalDate.now();
+            switch (searchType.getQuarter()){
+                case "1":
+                    beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(1).withDayOfMonth(1);
+                    endTime=beginTime.withMonth(3).with(TemporalAdjusters.lastDayOfMonth());
+                    break;
+                case "2":
+                    beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(4).withDayOfMonth(1);
+                    endTime=beginTime.withMonth(6).with(TemporalAdjusters.lastDayOfMonth());
+                    break;
+                case "3":
+                    beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(7).withDayOfMonth(1);
+                    endTime=beginTime.withMonth(9).with(TemporalAdjusters.lastDayOfMonth());
+                    break;
+                case "4":
+                    beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(10).withDayOfMonth(1);
+                    endTime=beginTime.withMonth(12).with(TemporalAdjusters.lastDayOfMonth());
+                    break;
+            }
+            enterpriseComplaint.setBeginTime(str.format(beginTime));
+            enterpriseComplaint.setEndTime(str.format(endTime));
+        }else {
+            LocalDate beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(1).withDayOfMonth(1);
+            LocalDate endTime = localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(12).with(TemporalAdjusters.lastDayOfMonth());
+            enterpriseComplaint.setBeginTime(str.format(beginTime));
+            enterpriseComplaint.setEndTime(str.format(endTime));
+        }
+        List<EnterpriseComplaint> enterpriseComplaintList=iEnterpriseComplaintService.selectEnterpriseComplaint(enterpriseComplaint);
+        int number=enterpriseComplaintList.size();
+        Map<Integer,Long> map=enterpriseComplaintList.stream().collect(Collectors.groupingBy(item->item.getComplaintType()==null?100:item.getComplaintType(),Collectors.counting()));
+        Map<String,String> dictDataMap=dictDataMapper.selectDictDataByType("caseType").stream().collect(Collectors.toMap(DictData::getDictValue,DictData::getDictLabel));
+        List<StatisticsIndicator> list=new ArrayList<>();
+        for(int i:map.keySet()){
+            StatisticsIndicator s=new StatisticsIndicator();
+            if(i==100){
+                s.setName("");
+                s.setNumInt(Integer.parseInt(map.get(100)+""));
+                s.setPercentage((double)number/map.get(100));
+            }else {
+                if(dictDataMap.containsKey(i+"")){
+                    s.setName(dictDataMap.get(i+""));
+                }else {
+                    s.setName(i+"");
+                }
+                s.setNumInt(Integer.parseInt(map.get(i)+""));
+                s.setPercentage((double)map.get(i)/number);
+            }
+            list.add(s);
+        }
+        return getDataTable(list);
+    }
+
+}
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java
@ -0,0 +1,112 @@
+package com.zdxt.code.controller;
+
+import com.zdxt.auth.project.system.dept.mapper.DeptMapper;
+import com.zdxt.auth.project.system.user.mapper.UserMapper;
+import com.zdxt.code.domain.EnforcementRegistration;
+import com.zdxt.code.domain.Zfryjdm2405301;
+import com.zdxt.code.domain.Zfztjdm111915;
+import com.zdxt.code.mapper.Zfryjdm2405301Mapper;
+import com.zdxt.code.mapper.Zfztjdm111915Mapper;
+import com.zdxt.code.service.IZfryjdm2405301Service;
+import com.zdxt.code.service.IZfztjdm111915Service;
+import com.zdxt.common.controller.BaseController;
+import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.domain.auth.Dept;
+import com.zdxt.domain.auth.User;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Controller
+@RequestMapping("/code/deptStatic")
+public class DeptStaticController extends BaseController {
+    private String prefix = "project/code/deptStatic";
+    @Autowired
+    private UserMapper userMapper;
+    @Autowired
+    private DeptMapper deptMapper;
+    @Autowired
+    private IZfryjdm2405301Service iZfryjdm2405301Service;
+    @Autowired
+    private IZfztjdm111915Service iZfztjdm111915Service;
+
+    @RequiresPermissions("code:deptStatic:view")
+    @GetMapping()
+    public String registration(Model model)
+    {
+        List<Zfztjdm111915> deptList=iZfztjdm111915Service.selectZfztjdmList(new Zfztjdm111915());
+        List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(null);
+        model.addAttribute("lawNumber",zfryjdm2405301List.size());
+        model.addAttribute("deptNumber",deptList.size());
+        return prefix + "/deptStatic";
+    }
+
+    @RequiresPermissions("code:deptStatic:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(Zfryjdm2405301 zfryjdm2405301)
+    {
+        /*List<Dept> deptList=deptMapper.selectDeptList(new Dept());
+        deptList=deptList.stream().filter(item->item.getDeptId()!=null&&!"".equals(item.getDeptId())&&item.getDeptName()!=null&&!"".equals(item.getDeptName())).collect(Collectors.toList());
+        Map<String,String> deptIdMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptId,Dept::getDeptName));
+        Map<String,String> deptNameMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptName,Dept::getDeptId));
+        if(user.getIsMappingPerson()!=null&&!"".equals(user.getIsMappingPerson())){
+            for(String s:deptNameMap.keySet()){
+                if(s.contains(user.getIsMappingPerson())){
+                    user.setDeptId(deptNameMap.get(s));
+                }
+            }
+            user.setIsMappingPerson(null);
+        }
+        startPage();
+        List<User> list=userMapper.selectUserList(user);
+        for(int i=0;i<list.size();i++){
+            if(deptIdMap.containsKey(list.get(i).getDeptId())){
+                list.get(i).setIsMappingPerson(deptIdMap.get(list.get(i).getDeptId()));
+            }else{
+                list.get(i).setIsMappingPerson(list.get(i).getDeptId());
+            }
+        }*/
+        startPage();
+        List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);
+        List<User> userlist=userMapper.selectUserList(new User());
+        //userlist=userlist.stream().filter(item->item.getCertificateNumber()!=null&&!"".equals(item.getCertificateNumber())).collect(Collectors.toList());
+        List<User> users=userlist.stream().filter(item->item.getCertificateNumber()!=null&&!"".equals(item.getCertificateNumber())).collect(Collectors.toList());
+        Map<String,User> userMap=users.stream().collect(Collectors.toMap(User::getCertificateNumber, Function.identity()));
+        for(int i=0;i<zfryjdm2405301List.size();i++){
+            if(zfryjdm2405301List.get(i).getSfzcodeEncrypt()!=null&&!"".equals(zfryjdm2405301List.get(i).getSfzcodeEncrypt())) {
+                if (userMap.containsKey(zfryjdm2405301List.get(i).getSfzcodeEncrypt())) {
+                    zfryjdm2405301List.get(i).setPhoneNumber(userMap.get(zfryjdm2405301List.get(i).getSfzcodeEncrypt()).getPhonenumber());
+                }
+            }
+        }
+
+        /*List<User> users=new ArrayList<>();
+        for(User u:list){
+            if(u.getDeptId()!=null&&!"".equals(u.getDeptId())){
+
+            }else if(deptMap.containsKey(u.getDeptId())){
+                u.setIsMappingPerson(deptMap.get(u.getDeptId()));
+            }else{
+                u.setIsMappingPerson(u.getDeptId());
+            }
+            users.add(u);
+        }*/
+
+        //list=users;
+        return getDataTable(zfryjdm2405301List);
+    }
+
+}
+
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java
@ -215,6 +215,8 @@ public class EnforcementCheckStatisticsController extends BaseController {
        Long userId=searchType.getUserId();
        String lawCertificateNum=userMapper.selectUserById(userId).getLawCertificateNum();
        String deptId=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm();
+        /*String certificateNumber=userMapper.selectUserById(userId).getCertificateNumber();
+        String deptId=zfryjdm2405301Mapper.selectZfryBySfz(certificateNumber).getZzjgdm();*/
        searchType.setUserId(null);
        searchType.setBureauDeptId(deptId);
        List<StatisticsIndicatorPart> statisticsIndicatorPartList =enforcementCheckStatisticsService.statisticsIndicatorPart3(searchType);
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
@ -1,25 +1,37 @@
 package com.zdxt.code.controller;

+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;

+import com.zdxt.auth.project.system.dict.service.IDictDataService;
 import com.zdxt.code.domain.EnforceRegCount;
 import com.zdxt.code.domain.EnterpriseLawEnforcement;
 import com.zdxt.code.domain.LinkageDict;
 import com.zdxt.code.service.ILinkageDictService;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
+import com.zdxt.common.util.ExcelUtils;
 import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.domain.auth.DictData;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import com.zdxt.code.domain.EnforcementRegistration;
 import com.zdxt.code.service.IEnforcementRegistrationService;

+import javax.servlet.Registration;
+import javax.servlet.http.HttpServletResponse;
+

 /**
 * 执法端-执法登记Controller
@ -36,11 +48,21 @@ public class EnforcementRegistrationController extends BaseController
    @Autowired
    private IEnforcementRegistrationService enforcementRegistrationService;
    @Autowired private ILinkageDictService iLinkageDictService;
+    @Autowired private IDictDataService iDictDataService;

    @RequiresPermissions("code:registration:view")
    @GetMapping()
-    public String registration()
+    public String registration(Model model)
    {
+        List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(new EnforcementRegistration());
+        List<EnforcementRegistration> uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())&&item.getUniteCheck().equals("1")).collect(Collectors.toList());
+        List<EnforcementRegistration> checkList=list.stream().filter(item->item.getCheckCategory()!=null&&!"".equals(item.getCheckCategory())&&item.getCheckCategory().equals("1")).collect(Collectors.toList());
+        String checkName=iDictDataService.selectDictLabel("check_category","01");
+        model.addAttribute("unite",uniteList.size());
+        model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));
+        model.addAttribute("check",checkName);//！！
+        model.addAttribute("checkNumber",checkList.size());
+        model.addAttribute("checkDouble",String.format("%.3f",((double)checkList.size()/list.size())));
        return prefix + "/registration";
    }

@ -53,9 +75,35 @@ public class EnforcementRegistrationController extends BaseController
    public TableDataInfo list(EnforcementRegistration enforcementRegistration)
    {
        startPage();
-        List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
+        List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration);
        return getDataTable(list);
    }
+    /**
+     * 查询执法端-执法登记列表
+     */
+    @RequiresPermissions("code:registration:list")
+    @GetMapping("/searchType")
+    public String searchType(EnforcementRegistration enforcementRegistration,Model model)
+    {
+        List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration);
+        System.out.println(1);
+        List<EnforcementRegistration> uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())&&item.getUniteCheck().equals("1")).collect(Collectors.toList());
+        List<EnforcementRegistration> checkList=new ArrayList<>();
+        String checkName;
+        if(enforcementRegistration.getCheckCategory()!=null&&!"".equals(enforcementRegistration.getCheckCategory())){
+            checkList=list.stream().filter(item->item.getCheckCategory()!=null&&!"".equals(item.getCheckCategory())&&item.getCheckCategory().equals(enforcementRegistration.getCheckCategory())).collect(Collectors.toList());
+            checkName = iDictDataService.selectDictLabel("check_category", enforcementRegistration.getCheckCategory());
+        }else {
+            checkList=list.stream().filter(item->item.getCheckCategory()!=null&&!"".equals(item.getCheckCategory())&&item.getCheckCategory().equals("01")).collect(Collectors.toList());
+            checkName = iDictDataService.selectDictLabel("check_category", "01");
+        }
+        model.addAttribute("unite",uniteList.size());
+        model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));
+        model.addAttribute("check",checkName);
+        model.addAttribute("checkNumber",checkList.size());
+        model.addAttribute("checkDouble",String.format("%.3f",((double)checkList.size()/list.size())));
+        return prefix+"/fragmentA";
+    }

    /**
     * 查询执法端-执法登记列表
@ -109,13 +157,16 @@ public class EnforcementRegistrationController extends BaseController
    @ResponseBody
    public ZDResponse editSave(@RequestBody EnforcementRegistration enforcementRegistration)
    {
-        int resNum = 0;
+        /*int resNum = 0;
        enforcementRegistration.setIsSubmit(1);
        if (StringUtils.isNotEmpty(enforcementRegistration.getId())) {
            resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration);
        } else {
            resNum = enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration);
-        }
+        }*/
+        int resNum = 0;
+        enforcementRegistration.setIsSubmit(1);
+        resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration);
        return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
    }

--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
@ -128,6 +128,9 @@ public class EnforcementRegistration extends BaseDomain
     * 日期搜索
     */
    private String dateSearch;
+    private String year;
+    private String quarter;
+    private String month;

    /**
     * 开始时间
@ -638,4 +641,28 @@ public class EnforcementRegistration extends BaseDomain
    public void setEnterpriseEvaluate(EnterpriseEvaluate enterpriseEvaluate) {
        this.enterpriseEvaluate = enterpriseEvaluate;
    }
+
+    public String getQuarter() {
+        return quarter;
+    }
+
+    public void setQuarter(String quarter) {
+        this.quarter = quarter;
+    }
+
+    public String getMonth() {
+        return month;
+    }
+
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
 }
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java
@ -19,6 +19,9 @@ public class SearchType {
    private Integer dateType;
    private String name;
    private Integer nameId;
+    private String year;
+    private String quarter;
+    private String month;

    public SearchType(){}
    public SearchType(SearchType searchType){
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java
@ -4,6 +4,7 @@ import com.zdxt.common.BaseDomain;
 import com.zdxt.domain.auth.Dept;
 import lombok.Data;

+import java.text.DecimalFormat;
 import java.util.List;

@Data
@ -21,8 +22,13 @@ public class StatisticsIndicator extends BaseDomain {
    private Dept dept;
    private List<LawEnforcementWarningList> lawEnforcementWarningListList;
    private List<String> stringList;
+    private String percentage;

    public void setNumDouble(Double numDouble) {
        this.numDouble = new Double(String.format("%.3f",numDouble));
    }
+    public void setPercentage(Double numDouble){
+        DecimalFormat str=new DecimalFormat("0.00%");
+        this.percentage=str.format(numDouble);
+    }
 }
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java
@ -42,6 +42,24 @@ public class Zfryjdm2405301 {
    private String codeState;
    /** 执法证编号 */
    private String zfcode;
+    public String phoneNumber;
+    public String ztName;
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public String getZtName() {
+        return ztName;
+    }
+
+    public void setZtName(String ztName) {
+        this.ztName = ztName;
+    }

    public String getSfzcodeEncrypt() {
        return sfzcodeEncrypt;
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfztjdm111915.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfztjdm111915.java
@ -0,0 +1,15 @@
+package com.zdxt.code.domain;
+
+import lombok.Data;
+
+@Data
+public class Zfztjdm111915 {
+    private String id;
+    private String updateTime;
+    private String updateStatus;
+    private String SEQ;
+    private String INS;
+    private String dataPlace;
+    private String subName;
+    private String code;
+}
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java
@ -26,7 +26,7 @@ public interface EnterpriseComplaintMapper
     * @return 企业执法-在线投诉集合
     */
    List<EnterpriseComplaint> selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint);
-
+    List<EnterpriseComplaint> selectEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint);
    /**
     * 查询投诉列表支持搜索
     * @param enterpriseComplaint
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java
@ -18,7 +18,7 @@ public interface Zfryjdm2405301Mapper
     * @return 集合
     */
    List<Zfryjdm2405301> selectZfryjdmList(String searchValue);
-
+    List<Zfryjdm2405301> selectZfryjdmList2 (Zfryjdm2405301 zfryjdm2405301);
    /**
     * 修改身份证号
     *
@ -35,4 +35,6 @@ public interface Zfryjdm2405301Mapper
    Zfryjdm2405301 selectZfryByZfCode(String zfcode);

    List<Zfryjdm2405301> selectZfryAllList();
+
+    Zfryjdm2405301 selectZfryBySfz(String sfzcode);
 }
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfztjdm111915Mapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfztjdm111915Mapper.java
@ -0,0 +1,16 @@
+package com.zdxt.code.mapper;
+
+import com.zdxt.code.domain.Zfryjdm2405301;
+import com.zdxt.code.domain.Zfztjdm111915;
+
+import java.util.List;
+
+public interface Zfztjdm111915Mapper {
+    /**
+     *
+     *
+     * @param
+     * @return 集合
+     */
+    List<Zfztjdm111915> selectZfztjdmList(Zfztjdm111915 zfztjdm111915);
+}
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
@ -32,6 +32,7 @@ public interface IEnforcementRegistrationService
     * @return 执法端-执法登记集合
     */
    List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
+    List<EnforcementRegistration>  selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration);

    /**
     * 查询企业端-执法登录列表
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java
@ -2,6 +2,7 @@ package com.zdxt.code.service;

 import com.zdxt.code.domain.EnterpriseComplaint;
 import com.zdxt.code.domain.MssqOrderFlow;
+import com.zdxt.common.annotation.DataScope;

 import java.util.List;

@ -67,4 +68,7 @@ public interface IEnterpriseComplaintService
     * @return 结果
     */
    int deleteEnterpriseComplaintById(String id);
+
+
+    List<EnterpriseComplaint> selectEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint);
 }
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java
@ -33,4 +33,6 @@ public interface IZfryjdm2405301Service
     * @return
     */
    Zfryjdm2405301 selectZfryByZfCode(String zfcode);
+
+    List<Zfryjdm2405301> selectZfryjdmList2(Zfryjdm2405301 zfryjdm2405301);
 }
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfztjdm111915Service.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfztjdm111915Service.java
@ -0,0 +1,9 @@
+package com.zdxt.code.service;
+
+import com.zdxt.code.domain.Zfztjdm111915;
+
+import java.util.List;
+
+public interface IZfztjdm111915Service {
+    List<Zfztjdm111915>selectZfztjdmList(Zfztjdm111915 zfztjdm111915);
+}
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
@ -2,6 +2,7 @@ package com.zdxt.code.service.impl;

 import java.time.LocalDate;
 import java.time.Month;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.stream.Collectors;
@ -14,6 +15,8 @@ import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.dto.ZdxtFileBean;
 import com.zdxt.auth.feign.UserApi;
 import com.zdxt.auth.feign.ZdxtFileCommonApi;
+import com.zdxt.auth.project.system.dept.service.IDeptService;
+import com.zdxt.auth.project.system.dict.service.IDictDataService;
 import com.zdxt.code.domain.*;
 import com.zdxt.code.mapper.LinkageDictMapper;
 import com.zdxt.code.service.*;
@ -24,12 +27,19 @@ import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.zdxtFile.AttFileRespDTO;
 import com.zdxt.common.zdxtFile.FilePreviewUtilBean;
 import com.zdxt.common.zdxtFile.ZdxtFileCommon;
+import com.zdxt.domain.auth.Dept;
+import com.zdxt.domain.auth.DictData;
 import com.zdxt.flow.mapper.IUserMapper;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
 import org.dmg.pmml.association.Item;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zdxt.code.mapper.EnforcementRegistrationMapper;

+import javax.servlet.http.HttpServletResponse;
+
 /**
 * 执法端-执法登记Service业务层处理
 * 
@ -60,6 +70,11 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
    @Autowired
    private IEnterpriseEvaluateService enterpriseEvaluateService;

+    @Autowired
+    private IDeptService iDeptService;
+    @Autowired
+    private IDictDataService iDictDataService;
+

    @Autowired
    private ILawEnforcementWarningListService lawEnforcementWarningListService;
@ -171,6 +186,67 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                enforcementRegistrationMapper.selectEnforcementRegistrationList(enforcementRegistration);
        return enforcementRegistrations;
    }
+    @Override
+    @DataScope
+    public List<EnforcementRegistration> selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration)
+    {
+        DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate localDate=LocalDate.now();
+        if((enforcementRegistration.getBeginTime()!=null&&!"".equals(enforcementRegistration.getBeginTime()))||(enforcementRegistration.getEndTime()!=null&&!"".equals(enforcementRegistration.getEndTime()))){
+            enforcementRegistration.setDateSearch(null);
+            enforcementRegistration.setYear(null);
+            enforcementRegistration.setQuarter(null);
+            enforcementRegistration.setMonth(null);
+        } else if (enforcementRegistration.getMonth()!=null&&!"".equals(enforcementRegistration.getMonth())) {
+            LocalDate beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(Integer.valueOf(enforcementRegistration.getMonth())).withDayOfMonth(1);
+            LocalDate endTime = beginTime.with(TemporalAdjusters.lastDayOfMonth());
+            enforcementRegistration.setBeginTime(str.format(beginTime));
+            enforcementRegistration.setEndTime(str.format(endTime));
+            enforcementRegistration.setDateSearch(null);
+            enforcementRegistration.setYear(null);
+            enforcementRegistration.setQuarter(null);
+            enforcementRegistration.setMonth(null);
+        } else if (enforcementRegistration.getQuarter()!=null&&!"".equals(enforcementRegistration.getQuarter())) {
+            LocalDate beginTime=LocalDate.now();
+            LocalDate endTime=LocalDate.now();
+            switch (enforcementRegistration.getQuarter()){
+                case "1":
+                    beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(1).withDayOfMonth(1);
+                    endTime=beginTime.withMonth(3).with(TemporalAdjusters.lastDayOfMonth());
+                    break;
+                case "2":
+                    beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(4).withDayOfMonth(1);
+                    endTime=beginTime.withMonth(6).with(TemporalAdjusters.lastDayOfMonth());
+                    break;
+                case "3":
+                    beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(7).withDayOfMonth(1);
+                    endTime=beginTime.withMonth(9).with(TemporalAdjusters.lastDayOfMonth());
+                    break;
+                case "4":
+                    beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(10).withDayOfMonth(1);
+                    endTime=beginTime.withMonth(12).with(TemporalAdjusters.lastDayOfMonth());
+                    break;
+            }
+            enforcementRegistration.setBeginTime(str.format(beginTime));
+            enforcementRegistration.setEndTime(str.format(endTime));
+            enforcementRegistration.setDateSearch(null);
+            enforcementRegistration.setYear(null);
+            enforcementRegistration.setQuarter(null);
+            enforcementRegistration.setMonth(null);
+        } else if (enforcementRegistration.getYear()!=null&&!"".equals(enforcementRegistration.getYear())) {
+            LocalDate beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(1).withDayOfMonth(1);
+            LocalDate endTime = localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(12).with(TemporalAdjusters.lastDayOfMonth());
+            enforcementRegistration.setBeginTime(str.format(beginTime));
+            enforcementRegistration.setEndTime(str.format(endTime));
+            enforcementRegistration.setDateSearch(null);
+            enforcementRegistration.setYear(null);
+            enforcementRegistration.setQuarter(null);
+            enforcementRegistration.setMonth(null);
+        }
+        List<EnforcementRegistration> enforcementRegistrations =
+                enforcementRegistrationMapper.selectEnforcementRegistrationList(enforcementRegistration);
+        return enforcementRegistrations;
+    }

    @Override
    public List<EnforcementRegistration> selectEnterpriseRegistrationList(EnforcementRegistration enforcementRegistration) {
@ -470,4 +546,23 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
        return firstDayOfMonth +"," + lastDayOfMonth;
    }

+    /*@Override
+    public void export(HttpServletResponse httpServletResponse,EnforcementRegistration enforcementRegistration,List<EnforcementRegistration> list){
+        List<Dept> deptList=iDeptService.selectDeptAll();
+        Map<String,String> deptMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptId,Dept::getDeptName));
+        List<DictData> dictDataList=iDictDataService.selectDictDataByType("check_category");
+        Map<String,String> dictDataMap=dictDataList.stream().collect(Collectors.toMap(DictData::getDictValue,DictData::getDictLabel));
+        HSSFWorkbook wb=new HSSFWorkbook();
+        HSSFSheet sheet= wb.createSheet("执法信息");
+        for(int i=0;i<list.size();i++){
+            Row row=sheet.createRow(i);
+            if(deptMap.containsKey(list.get(0).getBureauDeptId())) {
+                row.createCell(0).setCellValue(deptMap.get(list.get(0).getBureauDeptId()));
+            }else {
+                row.createCell(0).setCellValue(list.get(0).getBureauDeptId());
+            }
+            row.createCell(1).setCellValue();
+        }
+    }*/
+
 }
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
@ -4,7 +4,6 @@ import java.util.*;

 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@ -16,8 +15,8 @@ import com.zdxt.auth.feign.ZdxtFileCommonApi;
 import com.zdxt.code.domain.*;
 import com.zdxt.code.mapper.ComplaintItemMapper;
 import com.zdxt.code.mapper.EnforcementRegistrationMapper;
-import com.zdxt.code.service.IComplaintItemService;
 import com.zdxt.code.service.MssqApiService;
+import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.util.DateUtils;
 import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.zdxtFile.ZdxtFileCommon;
@ -329,4 +328,8 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
        }
        return null;
    }
+    @Override
+    public List<EnterpriseComplaint> selectEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint){
+        return enterpriseComplaintMapper.selectEnterpriseComplaint(enterpriseComplaint);
+    }
 }
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java
@ -3,6 +3,7 @@ package com.zdxt.code.service.impl;
 import com.zdxt.code.domain.Zfryjdm2405301;
 import com.zdxt.code.mapper.Zfryjdm2405301Mapper;
 import com.zdxt.code.service.IZfryjdm2405301Service;
+import com.zdxt.common.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
@ -32,4 +33,9 @@ public class Zfryjdm2405301ServiceImpl implements IZfryjdm2405301Service
    public Zfryjdm2405301 selectZfryByZfCode(String zfcode) {
        return zfryjdm2405301Mapper.selectZfryByZfCode(zfcode);
    }
+
+    @Override
+    public List<Zfryjdm2405301> selectZfryjdmList2(Zfryjdm2405301 zfryjdm2405301){
+        return zfryjdm2405301Mapper.selectZfryjdmList2(zfryjdm2405301);
+    }
 }
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java
@ -0,0 +1,21 @@
+package com.zdxt.code.service.impl;
+
+import com.zdxt.code.domain.Zfryjdm2405301;
+import com.zdxt.code.domain.Zfztjdm111915;
+import com.zdxt.code.mapper.Zfztjdm111915Mapper;
+import com.zdxt.code.service.IZfztjdm111915Service;
+import com.zdxt.common.annotation.DataScope;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service {
+    @Autowired
+    private Zfztjdm111915Mapper zfztjdm111915Mapper;
+    @Override
+    public List<Zfztjdm111915> selectZfztjdmList(Zfztjdm111915 zfztjdm111915){
+        return zfztjdm111915Mapper.selectZfztjdmList(zfztjdm111915);
+    }
+}
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@ -97,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="status != null "> and status = #{status}</if>
            <if test="lawEnforcementCode != null  and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
            <if test="uniteCheck != null  and uniteCheck != ''"> and unite_check = #{uniteCheck}</if>
+            <if test="checkCategory != null  and checkCategory != ''"> and check_category = #{checkCategory}</if>
+            <if test="checkCss != null  and checkCss != ''"> and check_css = #{checkCss}</if>

            <if test="searchValue != null and searchValue != ''">
                and (law_enforcement_item_text  like concat(concat('%',#{searchValue}),'%')
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml
@ -212,4 +212,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            </if>
        </where>
    </select>
+    <select id="selectEnterpriseComplaint" parameterType="EnterpriseComplaint" resultMap="EnterpriseComplaintResult">
+        <include refid="selectEnterpriseComplaintVo"/>
+        <where>
+        <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>
+    </select>
+
 </mapper>
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
@ -36,6 +36,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        </if>
    </select>

+    <select id="selectZfryjdmList2" parameterType="Zfryjdm2405301" resultMap="ZfryjdmResult">
+        <include refid="selectZfryjdmVo"/>
+        where code_state = '01'
+        <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>
+    </select>
+
    <update id="updateZfryjdmSfzcodeByid" parameterType="Zfryjdm2405301">
        update zfryjdm2405301
        <trim prefix="SET" suffixOverrides=",">
@ -53,4 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <include refid="selectZfryjdmVo" />
    </select>

+    <select id="selectZfryBySfz" parameterType="string" resultMap="ZfryjdmResult">
+        <include refid="selectZfryjdmVo" />
+        <where>
+            <if test="sfzcode != null and sfzcode != ''">and sfzcode_encrypt=#{sfzcode}</if>
+            and code_state = '01'
+        </where>
+        limit 1;
+    </select>
 </mapper>
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zdxt.code.mapper.Zfztjdm111915Mapper">
+    
+    <resultMap type="com.zdxt.code.domain.Zfztjdm111915" id="Zfztjdm111915Result">
+        <result property="id"    column="id"    />
+        <result property="updateTime"    column="updatetime"    />
+        <result property="updateStatus"    column="updatestatus"    />
+        <result property="SEQ"    column="SEQ"    />
+        <result property="INS"    column="INS"    />
+        <result property="dataPlace"    column="data_place"    />
+        <result property="subName"    column="sub_name"    />
+        <result property="code"    column="code"    />
+    </resultMap>
+
+    <sql id="selectZfztjdmVo">
+        select id, updatetime, updatestatus, SEQ, INS, data_place, sub_name, code from Zfztjdm111915
+    </sql>
+    <select id="selectZfztjdmList" parameterType="Zfztjdm111915" resultMap="Zfztjdm111915Result">
+        <include refid="selectZfztjdmVo"></include>
+        <where>
+            <if test="subName!=null and subName!=''">and sub_name like concat('%',#{subName},'%')</if>
+        </where>
+    </select>
+</mapper>