From 565a993f4b4b97a2a9f2376941848ba55b3accfa Mon Sep 17 00:00:00 2001
From: tangcy <406968399@qq.com>
Date: Fri, 27 Mar 2026 11:27:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/admin/contractor/domain/AccessPermit.java | 10 ++++++++--
 .../service/impl/AccessPermitIssuanceServiceImpl.java  | 10 ++++++++++
 .../src/main/resources/mapper/AccessPermitMapper.xml   |  6 ++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/domain/AccessPermit.java b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/domain/AccessPermit.java
index 8d421082..08a85b34 100644
--- a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/domain/AccessPermit.java
+++ b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/domain/AccessPermit.java
@@ -81,9 +81,15 @@ public class AccessPermit extends BaseEntity {
     @Schema(description = "附件列表（不映射到数据库）")
     private List<String> attachmentList;
     
-    @Schema(description = "作业班成员用户列表（不映射到数据库，从sys_user表查询）")
+    @Schema(description = "作业班成员用户列表（不映射到数据库，从 sys_user 表查询）")
     private List<SysUser> sysUserList;
     
-    @Schema(description = "作业班成员用户ID数组（不映射到数据库，用于前端传参）")
+    @Schema(description = "作业班成员用户 ID 数组（不映射到数据库，用于前端传参）")
     private Long[] sysUserIds;
+    
+    @Schema(description = "开始时间（不映射到数据库，用于时间范围查询）")
+    private String startTime;
+    
+    @Schema(description = "结束时间（不映射到数据库，用于时间范围查询）")
+    private String endTime;
 }
diff --git a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/owner/service/impl/AccessPermitIssuanceServiceImpl.java b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/owner/service/impl/AccessPermitIssuanceServiceImpl.java
index 7d454ac6..fae99ac7 100644
--- a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/owner/service/impl/AccessPermitIssuanceServiceImpl.java
+++ b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/owner/service/impl/AccessPermitIssuanceServiceImpl.java
@@ -63,10 +63,20 @@ public class AccessPermitIssuanceServiceImpl implements IAccessPermitIssuanceSer
     public List<AccessPermit> selectAccessPermitIssuanceList(AccessPermit accessPermit) {
         // 通过工作计划表取项目名称，通过工作负责人所属部门取施工单位（已在 Mapper 联查）
         List<AccessPermit> list = accessPermitMapper.selectAccessPermitIssuanceList(accessPermit);
+
         for (AccessPermit permit : list) {
             parseJsonFields(permit);
             loadSysUsers(permit);
         }
+
+        // 在内存中根据 constructionUnitName 字段进行模糊过滤
+        if (StringUtils.isNotBlank(accessPermit.getConstructionUnitName())) {
+            String keyword = accessPermit.getConstructionUnitName();
+            list = list.stream()
+                    .filter(permit -> StringUtils.isNotBlank(permit.getConstructionUnitName())
+                            && permit.getConstructionUnitName().contains(keyword))
+                    .collect(java.util.stream.Collectors.toList());
+        }
         return list;
     }
     
diff --git a/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/AccessPermitMapper.xml b/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/AccessPermitMapper.xml
index 7a8bdcbd..3ba583f2 100644
--- a/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/AccessPermitMapper.xml
+++ b/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/AccessPermitMapper.xml
@@ -106,6 +106,12 @@
         <if test="projectId != null">
             and ap.project_id = #{projectId}
         </if>
+        <if test="startTime != null and startTime != ''">
+            and ap.validity_end_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and ap.validity_start_time &lt;= DATE_ADD(DATE(#{endTime}), INTERVAL 1 DAY)
+        </if>
         order by ap.create_time desc
     </select>