监督端-统计修改-1209客户需求

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

@@ -14,11 +14,11 @@
                         <ul>
                             <li>
                                 <p>企业名称：</p>
-                                <input type="text" name="enterpriseName"/>
+                                <input type="text" id="enterpriseName" name="enterpriseName"/>
                             </li>
                             <li>
                                 <p>预警级别：</p>
-                                <select name="warningLevel" th:with="type=${@dict.getType('warnLevel')}">
+                                <select id="warningLevel" name="warningLevel" th:with="type=${@dict.getType('warnLevel')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
@@ -59,12 +59,25 @@
         var prefix = ctx + "code/LawEnforcementWarningList";
         var prefix2 = ctx + "code/registration";
         var warnLevel  = [[${@dict.getType('warnLevel')}]];
+        window.onload = function () {
+            if(window.sessionStorage.getItem('registrationDetailVueGo')){
+                document.getElementById("enterpriseName").value=window.sessionStorage.getItem('lawEnforcementWarningList-enterpriseName');
+                document.getElementById("warningLevel").value=window.sessionStorage.getItem('lawEnforcementWarningList-warningLevel');
+                document.getElementById("startTime").value=window.sessionStorage.getItem('lawEnforcementWarningList-startTime');
+                document.getElementById("endTime").value=window.sessionStorage.getItem('lawEnforcementWarningList-endTime');
+                $.table.search();
+                sessionStorage.clear();
+                console.log(window.sessionStorage.getItem('lawEnforcementWarningList-enterpriseName'));
+                console.log(window.sessionStorage.getItem('lawEnforcementWarningList-warningLevel'));
+                console.log(window.sessionStorage.getItem('lawEnforcementWarningList-startTime'));
+                console.log(window.sessionStorage.getItem('lawEnforcementWarningList-endTime'));
+            }
+        }
         $(function() {
             $('#detail2').hide();
             var date = new Date();
             var year = date.getFullYear();
             var month = date.getMonth() + 1;
-            console.log(year + "-" + month);
             $("input[name='currentMonth']").val(year + "-" + month);
             var options = {
                 url: prefix + "/list",
@@ -146,6 +159,10 @@
         }
         function detail(dictId) {
             console.log(dictId);
+            window.sessionStorage.setItem('lawEnforcementWarningList-enterpriseName', document.getElementById("enterpriseName").value);
+            window.sessionStorage.setItem('lawEnforcementWarningList-warningLevel', document.getElementById("warningLevel").value);
+            window.sessionStorage.setItem('lawEnforcementWarningList-startTime', document.getElementById("startTime").value);
+            window.sessionStorage.setItem('lawEnforcementWarningList-endTime', document.getElementById("endTime").value);
             var url = prefix + '/registrationDetail/' + dictId;
             $.modal.openTab("字典数据", url);
         }

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

@@ -12,7 +12,7 @@
                     <ul>
                         <li>
                             <p>执法部门：</p>
-                            <input type="text" name="lawEnforcement"/>
+                            <input type="text" name="bureauDeptName"/>
 <!--                            <input type="hidden" th:value="${time}" name="dateSearch"/>-->
                             <input type="hidden" th:value="${enterpriseNumber}" name="enterpriseNumber"/>
                             <input type="hidden" th:value="${beginTime}" name="beginTime"/>
@@ -31,6 +31,7 @@
                         <li>
                             <a class="btn btn-success btn-sm" onclick="rTable()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-reset btn-sm" onclick="rest1()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            <a class="btn btn-info btn-sm" id="closeButton" onclick="goBackToList()"><i class="fa fa-reply"></i> 返回</a>
                         </li>
                     </ul>
                 </div>
@@ -49,6 +50,12 @@
     window.onload = function () {
         rTable();
     }
+    function goBackToList() {
+        window.sessionStorage.setItem('registrationDetailVueGo', true);
+        console.log(window.sessionStorage.getItem('registrationDetailVueGo'))
+        console.log(document.referrer)
+        $.modal.openTab("字典数据", ctx + "code/LawEnforcementWarningList");
+    }
     $(function() {
         var options = {
             modalName: "执法记录统计",

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

@@ -89,8 +89,9 @@
                             <li>
                                 <a class="btn btn-success btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-reset btn-sm" onclick="resetR()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                <a class="btn btn-warning btn-sm" onclick="downloadR()"><i class="fa fa-share-square-o"></i> 导出</a>
+<!--                                <a class="btn btn-warning btn-sm" onclick="downloadR()"><i class="fa fa-share-square-o"></i> 导出</a>-->
-                                <a class="btn btn-warning btn-sm" onclick="downloadzf1()"><i class="fa fa-share-square-o"></i> 根据自定义时间导出执法监督码使用情况</a>
+<!--                                <a class="btn btn-warning btn-sm" onclick="downloadzf1()"><i class="fa fa-share-square-o"></i> 根据自定义时间导出执法监督码使用情况</a>-->
+                                <a class="btn btn-warning btn-sm" onclick="downloadzf1()"><i class="fa fa-share-square-o"></i> 导出</a>
                             </li>
                             <!--<a class="btn btn-warning btn-sm" onclick="download2()"><i class="fa fa-share-square-o"></i> 导出企业信息</a>-->
                         </ul>

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

@@ -61,7 +61,7 @@ public class ComplaintStaticController extends BaseController {
         model.addAttribute("Number1",complaintStatisticsService.selectComplaintStatisticsList(complaintStatistics).size());
         model.addAttribute("Number2",complaintStatisticsService.selectComplaintStatisticsGroup(complaintStatistics).size());
         model.addAttribute("Number3",complaintStatisticsService.selectComplaintStatisticsList(complaintStatistics).size());//权限
-        model.addAttribute("dou","100%");
+        model.addAttribute("dou","100.00%");
         return prefix+"/complaintStatic";
     }
 

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

@@ -28,6 +28,7 @@ public interface LawEnforcementWarningListMapper
     List<LawEnforcementWarningList> selectLawEnforcementWarningListList(LawEnforcementWarningList lawEnforcementWarningList);
     List<LawEnforcementWarningList> selectLawEnforcementWarningListList1(LawEnforcementWarningList lawEnforcementWarningList);
     List<LawEnforcementWarningList> selectLawEnforcementWarningListList2(LawEnforcementWarningList lawEnforcementWarningList);
+    List<LawEnforcementWarningList> selectLawEnforcementWarningListListTypeIs1(LawEnforcementWarningList lawEnforcementWarningList);
 
     /**
      * 查询执法预警列表列表显示最新(本企业)

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

@@ -33,6 +33,8 @@ public interface ILawEnforcementWarningListService
 
     List<LawEnforcementWarningList> selectLawEnforcementWarningListList2(LawEnforcementWarningList lawEnforcementWarningList);
 
+    List<LawEnforcementWarningList> selectLawEnforcementWarningListListTypeIs1(LawEnforcementWarningList lawEnforcementWarningList);
+
     /**
      * 查询企业预警信息
      * @param lawEnforcementWarningList

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

@@ -61,6 +61,11 @@ public class LawEnforcementWarningListServiceImpl implements ILawEnforcementWarn
         return lawEnforcementWarningListMapper.selectLawEnforcementWarningListList2(lawEnforcementWarningList);
     }
 
+    @Override
+    public List<LawEnforcementWarningList> selectLawEnforcementWarningListListTypeIs1(LawEnforcementWarningList lawEnforcementWarningList)
+    {
+        return lawEnforcementWarningListMapper.selectLawEnforcementWarningListListTypeIs1(lawEnforcementWarningList);
+    }
     @Override
     public List<LawEnforcementWarningList> selectLawEnforcementWarningByEnterpriseNumber(LawEnforcementWarningList lawEnforcementWarningList) {
 

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

@@ -171,10 +171,12 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
         warningStatisticsLast.setEndTime(sLast.getEndTime());
         List<LawEnforcementWarningList> lListNow1=iLawEnforcementWarningListService.selectLawEnforcementWarningListList2(warningStatisticsNow);
         List<LawEnforcementWarningList> lListLast1=iLawEnforcementWarningListService.selectLawEnforcementWarningListList2(warningStatisticsLast);
+        List<LawEnforcementWarningList> typeIs1ListNow=iLawEnforcementWarningListService.selectLawEnforcementWarningListListTypeIs1(warningStatisticsNow);
+        List<LawEnforcementWarningList> typeIs1ListLast=iLawEnforcementWarningListService.selectLawEnforcementWarningListListTypeIs1(warningStatisticsLast);
         StatisticsIndicatorPart p1=new StatisticsIndicatorPart();
         p1.setName("执法预警数量");
-        p1.setTotal(lListNow1.size());
+        p1.setTotal(typeIs1ListNow.size());
-        p1.setHuan(lListNow1.size()-lListLast1.size());
+        p1.setHuan(typeIs1ListNow.size()-typeIs1ListLast.size());
         Map<String,Long> mapNow=lListNow1.stream().collect(Collectors.groupingBy(LawEnforcementWarningList::getEnforcementDepartmentId,Collectors.counting()));
         Map<String,Long> mapLast=lListLast1.stream().collect(Collectors.groupingBy(LawEnforcementWarningList::getEnforcementDepartmentId,Collectors.counting()));
         StatisticsIndicatorPart p2=new StatisticsIndicatorPart();

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

@@ -231,6 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lawEnforcement != null  and lawEnforcement != ''"> and r.law_enforcement like concat('%', #{lawEnforcement}, '%')</if>
             <if test="bureauDeptName != null  and bureauDeptName != ''"> and r.bureau_dept_name like concat('%', #{bureauDeptName}, '%')</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and r.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and r.enterprise_number like concat('%', #{enterpriseNumber}, '%')</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''"> and (r.law_enforcer like concat('%',#{lawEnforcer} ,'%') or r.law_enforcer_two like concat('%',#{lawEnforcer} ,'%'))</if>
             <if test="isComplaint != null "> and r.is_complaint = #{isComplaint}</if>
             <if test="uniteCheck == '0'.toString()"> and r.unite_check is not null</if>

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

@@ -81,59 +81,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) t GROUP BY t.enterprise_number order by t.create_time desc
     </select>
     <select id="selectLawEnforcementWarningListListOrderByNumber" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult">
-        SELECT * FROM (
+        select *
-        SELECT
+        from (SELECT *
-        id,
+              FROM (SELECT id,
-        warning_time, warning_cause, warning_level ,
+                           warning_time,
-        create_time, enterprise_name, enterprise_number,
+                           warning_cause,
-        enforcement_number,warn_type,enforcement_department,
+                           warning_level,
-        enforcement_department_id,begin_time,end_time
+                           create_time,
-        FROM law_enforcement_warning_list
+                           enterprise_name,
+                           enterprise_number,
+                           enforcement_number,
+                           warn_type,
+                           enforcement_department,
+                           enforcement_department_id,
+                           begin_time,
+                           end_time
+                    FROM law_enforcement_warning_list
+                    ORDER BY enforcement_number DESC, create_time DESC LIMIT 1000000000) t
+              GROUP BY t.enterprise_number, DATE_FORMAT(t.warning_time, '%Y-%m')
+        ) x
         <where>
-            and warn_type = 1
+            and x.warn_type = 1
-            <if test="warningTime != null "> and warning_time = #{warningTime}</if>
+            <if test="warningTime != null "> and x.warning_time = #{warningTime}</if>
-            <if test="warningLevel != null "> and warning_level = #{warningLevel}</if>
+            <if test="warningLevel != null "> and x.warning_level = #{warningLevel}</if>
-            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and x.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
-            <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number like concat('%', #{enterpriseNumber}, '%')</if>
+            <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and x.enterprise_number like concat('%', #{enterpriseNumber}, '%')</if>
             <if test="searchValue != null  and searchValue != ''"> and (
-                enterprise_name like concat('%',#{searchValue},'%')
+                x.enterprise_name like concat('%',#{searchValue},'%')
                 )</if>
             <if test="searchDate != null  and searchDate != ''">
-                and DATE_FORMAT(warning_time, '%Y-%m') = #{searchDate}
+                and DATE_FORMAT(x.warning_time, '%Y-%m') = #{searchDate}
             </if>
             <if test="params.beginWarningTime != null  and params.beginWarningTime != ''">
-                and warning_time   <![CDATA[ >= ]]> #{params.beginWarningTime}
+                and x.warning_time   <![CDATA[ >= ]]> #{params.beginWarningTime}
             </if>
             <if test="params.endWarningTime != null  and params.endWarningTime != ''">
-                and warning_time <![CDATA[ <= ]]> #{params.endWarningTime}
+                and x.warning_time <![CDATA[ <= ]]> #{params.endWarningTime}
             </if>
-            <if test="warnType != null">AND warn_type = #{warnType}</if>
+            <if test="warnType != null">AND x.warn_type = #{warnType}</if>
             <if test=" enforcementDepartmentId != null  and enforcementDepartmentId != ''">
-                enforcement_department_id = #{enforcementDepartmentId},
+                x.enforcement_department_id = #{enforcementDepartmentId},
-            </if>
-            <if test="dateType != null and dateType == 1">
-                and DATE_FORMAT(warning_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
-            </if>
-            <if test="dateType != null and dateType == 2">
-                AND DATE_FORMAT(warning_time, '%Y-%m') &gt;= CONCAT(YEAR(CURDATE()), '-',
-                CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01'
-                WHEN QUARTER(CURDATE()) IN (2) THEN '04'
-                WHEN QUARTER(CURDATE()) IN (3) THEN '07'
-                ELSE '10' END)
-                and DATE_FORMAT(warning_time, '%Y-%m') &lt;= CONCAT(YEAR(CURDATE()), '-',
-                CASE
-                WHEN QUARTER(CURDATE()) IN (1) THEN '03'
-                WHEN QUARTER(CURDATE()) IN (2) THEN '06'
-                WHEN QUARTER(CURDATE()) IN (3) THEN '09'
-                ELSE '12'
-                END)
-            </if>
-            <if test="dateType != null and dateType == 3">
-                and DATE_FORMAT(warning_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
             </if>
         </where>
-        ORDER BY enforcement_number DESC,create_time DESC LIMIT 1000000000
+        order by x.enforcement_number desc, x.warning_time desc
-        ) t GROUP BY t.enterprise_number,DATE_FORMAT(t.warning_time, '%Y-%m') order by t.enforcement_number desc,t.warning_time desc
     </select>
     <!--<select id="selectLawEnforcementWarningListList1" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult">
         SELECT enforcement_department,enforcement_department_id,DATE_FORMAT(t.create_time,'%Y-%m') as searchDate,enforcement_number
@@ -198,6 +188,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         ORDER BY warning_level ASC,create_time DESC
     </select>
+    <select id="selectLawEnforcementWarningListListTypeIs1" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult">
+        <include refid="selectLawEnforcementWarningListVo"/>
+        <where>
+            and warn_type=1
+            <if test="deptQx != null  and deptQx != ''">and enforcement_department_id =#{deptQx}</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
+            </if>
+        </where>
+        ORDER BY warning_level ASC,create_time DESC
+    </select>
 
     <select id="selectLawEnforcementWarningByEnterpriseNumber" parameterType="LawEnforcementWarningList"
             resultMap="LawEnforcementWarningListResult">