From 1cbc32fa7e4cc6dbd2d0c0aa72b4631505df2b25 Mon Sep 17 00:00:00 2001
From: jiayang yue <jiayang.yue@xujiesoft.com>
Date: Thu, 5 Jun 2025 17:23:17 +0800
Subject: [PATCH] =?UTF-8?q?2025.06.05=20=E7=BB=B4=E4=BF=AE=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=20=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E5=92=8C=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/data/EamDefectFeedBackInData.java     | 20 +++++++++++++++++++
 src/main/resources/mapper/pms/EamMapper.xml   | 11 +++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamDefectFeedBackInData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamDefectFeedBackInData.java
index 58a4beb1..a962eb31 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamDefectFeedBackInData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamDefectFeedBackInData.java
@@ -86,4 +86,24 @@ public class EamDefectFeedBackInData extends EamDefectFeedBackData{
     public void setUserId(String userId) {
         this.userId = userId;
     }
+
+    private String department;
+
+    private String locationName;
+
+    public String getLocationName() {
+        return locationName;
+    }
+
+    public void setLocationName(String locationName) {
+        this.locationName = locationName;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
 }
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index d4f8cbe5..15338a5b 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -1655,7 +1655,9 @@
             FinishDate,
             dbo.joint_name(a.Site, a.bu_no, (select OrderNo from eam_workOrder where PlanID = a.FeedBackID and site = a.site and Result = '维修完成' and bu_no = a.bu_no),a.FunctionType) as actualOperatorName,
             a.repair_reporting_type,
-            a.repair_type
+            a.repair_type,
+            f.department_name as department,
+            g.LocationName
         from eam_defect_feedBack a
         left join eam_defect b on a.DefectID = b.DefectID
         left join operator as c on a.site = c.site and a.CreatedBy = c.operator_id
@@ -1663,6 +1665,7 @@
         left join sys_department as f on e.site = f.site and e.dept_id = f.department_id and e.bu_no = f.bu_no
         left join Access_dept as ead ON ead.site = f.site and ead.department_id = f.department_id and ead.bu_no = f.bu_no
         left join sys_user as ea on ead.username = ea.username
+        left join eam_location as g on e.site = g.site and e.LocationID = g.LocationID and e.bu_no = g.bu_no
         <where>
             a.site in (select site from eam_access_site where username = #{query.userName})
             and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))
@@ -1700,6 +1703,12 @@
             <if test="query.repairType != null and query.repairType != ''">
                 AND a.repair_type = #{query.repairType}
             </if>
+            <if test="query.department != null and query.department != ''">
+                AND f.department_name like '%' + #{query.department} + '%'
+            </if>
+            <if test="query.locationName != null and query.locationName != ''">
+                AND g.LocationName like '%' + #{query.locationName} + '%'
+            </if>
             and a.FunctionType = #{query.functionType}
         </where>
         ORDER BY a.DefectDate,