From 21b3150180bd46d0dad72b8892d1503a826a4b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Mon, 13 Oct 2025 17:53:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=89=E5=85=A8=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E5=91=98=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/EamController.java |  5 ++
 .../sys/modules/pms/mapper/EamMapper.java     |  2 +
 .../sys/modules/pms/service/EamService.java   |  2 +
 .../pms/service/Impl/EamServiceImpl.java      |  7 ++
 src/main/resources/mapper/pms/EamMapper.xml   | 83 +++++++++++++++++++
 5 files changed, 99 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
index 4fe3cff5..965cadcf 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
@@ -2167,6 +2167,11 @@ public class EamController {
         PageUtils page  = eamService.eamCheckRecordSearch(data);
         return R.ok().put("page", page);
     }
+    @PostMapping(value="/eamCheckRecordSearch2")
+    public R eamCheckRecordSearch2(@RequestBody EamWorkOrderInData data) {
+        PageUtils page  = eamService.eamCheckRecordSearch2(data);
+        return R.ok().put("page", page);
+    }
 
     @PostMapping(value="/eamDefectRecordSearch")
     public R eamDefectRecordSearch(@RequestBody EamWorkOrderInData data){
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
index 8ae29335..6c84e69a 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
@@ -385,6 +385,8 @@ public interface EamMapper {
 
     IPage<EamWorkOrderInData> eamCheckRecordSearch(Page<EamWorkOrderInData> eamWorkOrderInDataPage, @Param("query") EamWorkOrderInData data);
 
+    IPage<EamWorkOrderInData> eamCheckRecordSearch2(Page<EamWorkOrderInData> eamWorkOrderInDataPage, @Param("query") EamWorkOrderInData data);
+
     IPage<EamWorkOrderInData> eamDefectRecordSearch(Page<EamWorkOrderInData> eamWorkOrderInDataPage, @Param("query") EamWorkOrderInData data);
 
     List<SysRoleEntity> getUserRoleList();
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java
index dac6fee8..08ecb325 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java
@@ -1118,6 +1118,8 @@ public interface EamService {
 
     PageUtils eamCheckRecordSearch(EamWorkOrderInData data);
 
+    PageUtils eamCheckRecordSearch2(EamWorkOrderInData data);
+
     PageUtils eamDefectRecordSearch(EamWorkOrderInData data);
 
     List<SysRoleEntity> getUserRoleList();
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
index 8fc15909..2b6c4206 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
@@ -3351,6 +3351,13 @@ public class EamServiceImpl implements EamService {
         return new PageUtils(resultList);
     }
 
+    @Override
+    public PageUtils eamCheckRecordSearch2(EamWorkOrderInData data) {
+        // 查出全部要执行的工单
+        IPage<EamWorkOrderInData> resultList = this.eamMapper.eamCheckRecordSearch2(new Page<EamWorkOrderInData>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(resultList);
+    }
+
     @Override
     public PageUtils eamDefectRecordSearch(EamWorkOrderInData data) {
         if (StringUtils.isNotBlank(data.getDepartmentName())) {
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 15abb6f5..3437497f 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -3004,6 +3004,89 @@
         </where>
     </select>
 
+    <select id="eamCheckRecordSearch2" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData" resultType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
+        SELECT
+        B.ObjectDesc,
+        a.Site,
+        a.bu_no,
+        dbo.get_bu_desc(a.site, a.bu_no) as buDesc,
+        a.OrderNo,
+        a.PlanID,
+        a.PlanDesc,
+        a.PropertiesCode,
+        a.ObjectID,
+        a.Status,
+        a.PlanOperator,
+        a.checker,
+        a.ActualOperator,
+        a.PlanDate,
+        a.ActualDate,
+        a.FunctionType,
+        a.CreateDate,
+        a.Remark,
+        a.StartTime,
+        a.EndTime,
+        a.WorkTime,
+        a.PlanOperatorName,
+        a.checkerName,
+        dbo.eam_Get_eamAdminName(a.Site, a.ActualOperator) as ActualOperatorName,
+        dbo.eam_Get_eam_properties_CodeDesc(a.site, a.bu_no, a.FunctionType, a.PropertiesCode) as codeDesc,
+        a.result,
+        a.checkResult,
+        a.disposal_measures,
+        a.check_work_plan_id,
+        a.check_item_no,
+        a.reach_date,
+        a.reach_operator,
+        a.reach_operator_name,
+        dbo.joint_id(a.Site, a.bu_no, a.OrderNo, a.FunctionType) as adminID,
+        dbo.joint_name(a.Site, a.bu_no, a.OrderNo, a.FunctionType) as operator,
+        a.check_remark,
+        a.document_source
+        FROM eam_workOrder a
+        INNER JOIN eam_object B ON A.SITE = B.SITE AND A.bu_no = B.bu_no AND A.ObjectID = B.ObjectID
+        <where>
+            A.site  = #{query.site}  AND dbo.get_bu_desc ( a.site, a.bu_no ) = #{query.buDesc} and a.PlanOperatorName like '%网格员%'
+            <if test="query.orderNo != null and query.orderNo != ''">
+                AND a.OrderNo like '%' + #{query.orderNo} +'%'
+            </if>
+            <if test="query.planID != null and query.planID != ''">
+                AND a.PlanID like '%' + #{query.planID} +'%'
+            </if>
+            <if test="query.planDesc != null and query.planDesc != ''">
+                AND a.PlanDesc like '%' + #{query.planDesc} +'%'
+            </if>
+            <if test="query.objectID != null and query.objectID != ''">
+                AND a.ObjectID like '%' + #{query.objectID} +'%'
+            </if>
+            <if test="query.planOperatorName != null and query.planOperatorName != ''">
+                AND a.PlanOperatorName like '%' + #{query.planOperatorName} +'%'
+            </if>
+            <if test='query.documentSource != null and query.documentSource != "" and query.functionType == "C" and query.searchType == "reportDefect" '>
+                AND a.document_source = #{query.documentSource}
+            </if>
+            <if test="query.planDate != null">
+                AND a.PlanDate = #{query.planDate}
+            </if>
+            <if test="query.startDate != null ">
+                AND a.PlanDate >= #{query.startDate}
+            </if>
+            <if test="query.endDate != null ">
+                AND #{query.endDate} >= a.PlanDate
+            </if>
+            <if test="query.endDate == null ">
+                AND getDate() >= a.PlanDate
+            </if>
+            <if test="query.reachDate != null ">
+                AND a.reach_date >= #{query.reachDate}
+            </if>
+            <if test="query.actualDate != null ">
+                AND #{query.actualDate} >= a.ActualDate
+            </if>
+            AND a.FunctionType = #{query.functionType}
+        </where>
+    </select>
+
     <select id="eamDefectRecordSearch"  parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData" resultType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         SELECT
         a.Site,