From 051293f95286cb6300dac6e4db9321e6ff759def Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Thu, 7 Nov 2024 17:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zdxt/code/domain/EnforceRegCount.java | 18 +++++++++++++
 .../EnforcementRegistrationServiceImpl.java   |  1 -
 .../com/zdxt/code/task/EarlyWarningTask.java  |  6 ++++-
 .../mapper/EnforcementRegistrationMapper.xml  | 25 +++++++++++--------
 .../LawEnforcementWarningListMapper.xml       |  3 ++-
 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java
index 161b6c20..3afe8764 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java
@@ -21,6 +21,8 @@ public class EnforceRegCount
     private String lawEnforcement;
     /** 执法部门ID */
     private String lawEnforcementId;
+    private String bureauDeptId;
+    private String bureauDeptName;
     /**
      * 企业统一信用代码
      */
@@ -78,6 +80,22 @@ public class EnforceRegCount
         this.lawEnforcementId = lawEnforcementId;
     }
 
+    public String getBureauDeptId() {
+        return bureauDeptId;
+    }
+
+    public void setBureauDeptId(String bureauDeptId) {
+        this.bureauDeptId = bureauDeptId;
+    }
+
+    public String getBureauDeptName() {
+        return bureauDeptName;
+    }
+
+    public void setBureauDeptName(String bureauDeptName) {
+        this.bureauDeptName = bureauDeptName;
+    }
+
     public Integer getNum() {
         return num;
     }
diff --git 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
index c87669fe..aaff45c4 100644
--- 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
@@ -398,7 +398,6 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
             // 根据规则作为条件查询符合要求的数据
             List<EnforceRegCount> regList = new ArrayList<>();
             for (RuleItemList rule : ruleItemLists) {
-
                 if(list.getRuleCode().equals("zf_warn")){
                     String time = getTime(rule.getCycleTime().intValue());
                     String[] timeArr = time.split(",");
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java
index 178e6745..ca9fc29a 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java
@@ -68,9 +68,13 @@ public class EarlyWarningTask {
 
                     warning.setId(IdUtil.simpleUUID());
                     warning.setCreateTime(DateUtils.getNowDate());
-                    if(StrUtil.isNotEmpty(warn.getLawEnforcementId()) && warn.getWarnType() == 0){
+                    /*if(StrUtil.isNotEmpty(warn.getLawEnforcementId()) && warn.getWarnType() == 0){
                         warning.setEnforcementDepartment(warn.getLawEnforcement());
                         warning.setEnforcementDepartmentId(warn.getLawEnforcementId());
+                    }*/
+                    if(StrUtil.isNotEmpty(warn.getBureauDeptId()) && warn.getWarnType() == 0){
+                        warning.setEnforcementDepartment(warn.getBureauDeptName());
+                        warning.setEnforcementDepartmentId(warn.getEnforcementDepartmentId());
                     }
                     //开始时间结束时间
                     warning.setBeginTime(warn.getBeginTime());
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index 135b6e0f..bc1490f4 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -53,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="num"    column="num"    />
         <result property="lawEnforcement"    column="law_enforcement"    />
         <result property="lawEnforcementId"    column="law_enforcement_id"    />
+        <result property="bureauDeptName"    column="bureau_dept_name"    />
+        <result property="bureauDeptId"    column="bureau_dept_id"    />
     </resultMap>
 
     <sql id="selectEnforcementRegistrationVo">
@@ -446,7 +448,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-
+<!--
     <select id="countMentByTime" resultMap="EnforceRegCountResult"
             resultType="com.zdxt.code.domain.EnforceRegCount">
         SELECT law_enforcement, law_enforcement_id,enterprise_number, COUNT(law_enforcement_id) AS num
@@ -465,34 +467,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="searchValue != null and searchValue != ''">AND t1.enterprise_name like concat(concat('%',#{searchValue}),'%')</if>
         AND t1.law_enforcement_id IS NOT NULL
         GROUP BY t1.enterprise_number
-    </select>
+    </select>-->
     <select id="countMentByTimeLawNew" resultMap="EnforceRegCountResult"
             resultType="com.zdxt.code.domain.EnforceRegCount">
         SELECT
-            t1.law_enforcement_id,
-            t1.law_enforcement,
+            t1.bureau_dept_name,
+            t1.bureau_dept_id,
             t1.enterprise_name,
             t1.enterprise_number,
             SUM(T1.total) as num
         FROM
-            ( SELECT enterprise_name, enterprise_number, law_enforcement_id,law_enforcement, unite_check, create_time ,
+            ( SELECT enterprise_name, enterprise_number, bureau_dept_id,bureau_dept_name, unite_check, create_time ,
             count( enterprise_number ) AS total  FROM enforcement_registration
-            WHERE <![CDATA[ create_time >= #{beginTime}  AND create_time <= #{endTime} ]]> AND law_enforcement_id IS NOT NULL  GROUP BY IFNULL(unite_check, RAND()) ,law_enforcement_id  ) AS t1
-            GROUP BY t1.law_enforcement_id,t1.enterprise_number
+            WHERE <![CDATA[ create_time >= #{beginTime}  AND create_time <= #{endTime} ]]> AND bureau_dept_id IS NOT NULL
+            GROUP BY IFNULL(unite_check, RAND()) ,bureau_dept_id  ) AS t1
+            GROUP BY t1.bureau_dept_id,t1.enterprise_number
     </select>
     <select id="countMentByTimeQyNew" resultMap="EnforceRegCountResult"
             resultType="com.zdxt.code.domain.EnforceRegCount">
         SELECT
-            t1.law_enforcement_id,
+            t1.bureau_dept_id,
             t1.enterprise_name ,
             t1.enterprise_number,
             SUM(T1.total) as num
         FROM
-            ( SELECT enterprise_name, enterprise_number, law_enforcement_id, unite_check, create_time ,
+            ( SELECT enterprise_name, enterprise_number, bureau_dept_id, unite_check, create_time ,
             count( enterprise_number ) AS total  FROM enforcement_registration
             WHERE <![CDATA[ create_time >= #{beginTime} AND create_time <= #{endTime} ]]>
-                AND law_enforcement_id IS NOT NULL
-                GROUP BY IFNULL(unite_check, RAND()) ,law_enforcement_id ) AS t1
+                AND bureau_dept_id IS NOT NULL
+                GROUP BY IFNULL(unite_check, RAND()) ,bureau_dept_id ) AS t1
                 GROUP BY t1.enterprise_number
     </select>
 
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml
index c1077a4a..d8788119 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml
@@ -167,7 +167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name,</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number,</if>
             <if test="enforcementNumber != null  and enforcementNumber != ''">enforcement_number,</if>
-            <if test=" enforcementDepartment != null  and enforcementDepartment != ''">enforcement_department,</if>
+            <if test=" enforcementDepartment != null  and enforce
+            mentDepartment != ''">enforcement_department,</if>
             <if test=" enforcementDepartmentId != null  and enforcementDepartmentId != ''">enforcement_department_id,</if>
             <if test="warnType != null">warn_type,</if>
             <if test="beginTime != null and beginTime != '' ">begin_time,</if>