From 96b64ddc07d77f7ecd2930676c598d05de3efd51 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Thu, 22 May 2025 10:21:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppEnforcementRegistrationController.java | 16 ++++------
 .../code/domain/EnforcementRegistration.java  | 32 +++++++++++++++++++
 .../mapper/EnforcementRegistrationMapper.xml  | 15 ++++++---
 3 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
index 27f5674f..e6689a7c 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
@@ -1,5 +1,6 @@
 package com.zdxt.app.controller;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import com.zdxt.auth.dto.DeptBean;
 import com.zdxt.auth.dto.DictDataBean;
@@ -10,10 +11,7 @@ import com.zdxt.code.domain.*;
 import com.zdxt.code.service.*;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
-import com.zdxt.common.util.Constants;
-import com.zdxt.common.util.ServletUtils;
-import com.zdxt.common.util.StringUtils;
-import com.zdxt.common.util.TableDataInfo;
+import com.zdxt.common.util.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -30,7 +28,7 @@ import java.util.stream.Collectors;
 
 /**
  * 执法端-执法登记Controller
- * 
+ *
  * @author chenrui
  * @date 2024-02-23
  */
@@ -194,11 +192,11 @@ public class AppEnforcementRegistrationController extends BaseController
     @ResponseBody
     public TableDataInfo queryListNew(EnforcementRegistration enforcementRegistration)
     {
-        startPage();
-        if (StringUtils.isEmpty(enforcementRegistration.getSearchValue())
-                && StringUtils.isEmpty(enforcementRegistration.getEnterpriseNumber())) {
-            return getDataTable(new ArrayList<EnforcementRegistration>());
+        if (Objects.nonNull(enforcementRegistration.getUserId())) {
+            UserBean userByUserId = userApi.getUserByUserId(enforcementRegistration.getUserId());
+            enforcementRegistration.setDeptId(userByUserId == null ? null : userByUserId.getDeptId());
         }
+        startPage();
         List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration);
         return getDataTable(list);
     }
diff --git 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
index aad26d97..3698a3a9 100644
--- 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
@@ -192,6 +192,11 @@ public class EnforcementRegistration extends BaseDomain
      */
     private String regionId;
 
+    /**
+     * 提醒类型 0：本单位 1：全市
+     */
+    private Integer warnType;
+
 
     public String getDeptQx() {
         return deptQx;
@@ -231,6 +236,10 @@ public class EnforcementRegistration extends BaseDomain
 
     private String num;
 
+    private String numLeft;
+
+    private String numRight;
+
     /**
      * 行政执法评价
      */
@@ -757,6 +766,13 @@ public class EnforcementRegistration extends BaseDomain
     public void setRegionId(String regionId) {
         this.regionId = regionId;
     }
+    public Integer getWarnType() {
+        return warnType;
+    }
+
+    public void setWarnType(Integer warnType) {
+        this.warnType = warnType;
+    }
 
     public String getNum() {
         return num;
@@ -765,4 +781,20 @@ public class EnforcementRegistration extends BaseDomain
     public void setNum(String num) {
         this.num = num;
     }
+
+    public String getNumLeft() {
+        return numLeft;
+    }
+
+    public void setNumLeft(String numLeft) {
+        this.numLeft = numLeft;
+    }
+
+    public String getNumRight() {
+        return numRight;
+    }
+
+    public void setNumRight(String numRight) {
+        this.numRight = numRight;
+    }
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index 76c970f2..ebd2486a 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -47,7 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isEvaluate"    column="is_evaluate"    />
         <result property="lawId"    column="law_id"    />
         <result property="lawText"    column="law_text"    />
-        <result property="num"    column="num"    />
+        <result property="numLeft"    column="numLeft"    />
+        <result property="numRight"    column="numRight"    />
     </resultMap>
 
     <resultMap type="com.zdxt.code.domain.EnforceRegCount" id="EnforceRegCountResult">
@@ -164,8 +165,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
             <if test="status != null "> and status = #{status}</if>
 
@@ -224,9 +223,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY enterprise_number order by enforcement_time desc) t
         <where>
-          <if test="num != null and num != ''">
-            and t.num &gt;= #{num}
+          <if test="numLeft != null and numLeft != ''">
+            and t.num &gt;= #{numLeft}
+          </if>
+          <if test="numRight != null and numRight != ''">
+                and t.num &lt;= #{numRight}
           </if>
+<!--          <if test="deptId != null and warnType!=null and warnType ==0" >-->
+<!--            and t.bureau_dept_id = #{deptId} or find_in_set(#{deptId}, d.ancestors)-->
+<!--          </if>-->
        </where>
     </select>