From c18ee6eafdde56d18b0434319bf35555e93e2a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Thu, 20 Jul 2023 11:16:52 +0800
Subject: [PATCH] =?UTF-8?q?2023-07-20=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/service/Impl/EamServiceImpl.java       |  1 -
 src/main/resources/mapper/pms/EamMapper.xml    | 18 +++++++++---------
 src/main/resources/mapper/pms/QcMapper.xml     |  6 ++++++
 3 files changed, 15 insertions(+), 10 deletions(-)

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 5e80e238..e6d2ad2b 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
@@ -1835,7 +1835,6 @@ public class EamServiceImpl implements EamService {
         if(checkEamAdmin.size()==0){
             throw new RuntimeException("该机修人员编码不存在!");
         }
-
         eamMapper.updateFeedBack(inData);
         eamMapper.saveDefectOrder(inData);
     }
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 8d2a1162..0537076d 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -1523,9 +1523,9 @@ b.MinValue,b.ItemRemark,b.ItemType
 
     <!-- 查询设备所属部门 -->
     <select id="selectDeptByObjectID" resultType="string" parameterType="string">
-        SELECT ved.dept_name
+        SELECT ved.department_name
         FROM eam_object as eo
-        LEFT JOIN view_eam_department as ved ON eo.site = ved.site and eo.dept_id = ved.dept_id
+        LEFT JOIN sys_department as ved ON eo.site = ved.site and eo.dept_id = ved.department_id
         WHERE eo.site = #{site}
         AND eo.ObjectID = #{objectID}
     </select>
@@ -1634,11 +1634,11 @@ b.MinValue,b.ItemRemark,b.ItemType
     <!-- 查询部门详情 -->
     <select id="getDeptDetail" resultType="EamAdminData" parameterType="string">
         SELECT
-            ved.dept_id as department,
-            ved.dept_name as departmentName
+            ved.department_id as department,
+            ved.department_name as departmentName
         FROM eam_admin_dept as ead
-        LEFT JOIN view_eam_department as ved
-        ON ead.site = ved.site and ead.dept_id = ved.dept_id
+        LEFT JOIN sys_department as ved
+        ON ead.site = ved.site and ead.dept_id = ved.department_id
         WHERE ead.site = #{site}
         AND ead.admin_id = #{adminID}
     </select>
@@ -1646,10 +1646,10 @@ b.MinValue,b.ItemRemark,b.ItemType
     <!-- 查询部门列表 -->
     <select id="getDeptList" resultType="string" parameterType="string">
         SELECT
-            ved.dept_name
+            ved.department_name
         FROM eam_admin_dept as ead
-        LEFT JOIN view_eam_department as ved
-        ON ead.site = ved.site and ead.dept_id = ved.dept_id
+        LEFT JOIN sys_department as ved
+        ON ead.site = ved.site and ead.dept_id = ved.department_id
         WHERE ead.site = #{site}
         AND ead.admin_id = #{adminID}
     </select>
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index f62ef274..d5296850 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1999,6 +1999,12 @@
             <if test = "query.inspectionResult != null and query.inspectionResult != ''">
                 AND inspection_result = #{query.inspectionResult}
             </if>
+            <if test = "query.partNo != null and query.partNo != ''">
+                AND part_no LIKE '%' + #{query.partNo} + '%'
+            </if>
+            <if test = "query.partDesc != null and query.partDesc != ''">
+                AND part_desc LIKE '%' + #{query.partDesc} + '%'
+            </if>
             <if test="query.startDate != null">
                 AND create_date >= #{query.startDate}
             </if>