From 0393519849dee701647bc528f9ab5970bcc3fec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Wed, 21 Jun 2023 18:40:35 +0800
Subject: [PATCH] =?UTF-8?q?2023-06-21=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=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/mapper/EamMapper.java     |  1 +
 .../pms/service/Impl/EamServiceImpl.java      | 26 +++++++++----------
 src/main/resources/mapper/pms/EamMapper.xml   | 22 ++++++++++------
 3 files changed, 28 insertions(+), 21 deletions(-)

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 d4d6684e..9dc7a69f 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
@@ -1074,4 +1074,5 @@ public interface EamMapper {
     void deleteAdminDepartment(String site, String adminID);
 
     List<SysUserEntity> getMesList(SysUserEntity data);
+
 }
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 6cff6efb..0434a3a8 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
@@ -1679,19 +1679,19 @@ public class EamServiceImpl implements EamService {
     public List<EamWorkOrderInData> queryHistoryRecord(EamWorkOrderInData data) {
         // 查询设备的历史记录
         List<EamWorkOrderInData> list = eamMapper.queryHistoryRecord(data);
-        // 拼接机修人员
-        for(EamWorkOrderInData ewoData : list){
-            List<String> actualOperatorList = eamMapper.getActualOperatorList(ewoData.getSite(), ewoData.getOrderNo(), ewoData.getFunctionType());
-            String operator = "";
-            for (int i = 0; i < actualOperatorList.size(); i++) {
-                if (operator.equals("")){
-                    operator = actualOperatorList.get(i);
-                }else {
-                    operator = operator + ";" + actualOperatorList.get(i);
-                }
-            }
-            ewoData.setActualOperatorName(operator);
-        }
+//        // 拼接点检人员
+//        for(EamWorkOrderInData ewoData : list){
+//            List<String> actualOperatorList = eamMapper.getActualOperatorList(data.getSite(), ewoData.getOrderNo(), data.getFunctionType());
+//            String operator = "";
+//            for (int i = 0; i < actualOperatorList.size(); i++) {
+//                if (operator.equals("")){
+//                    operator = actualOperatorList.get(i);
+//                }else {
+//                    operator = operator + ";" + actualOperatorList.get(i);
+//                }
+//            }
+//            ewoData.setActualOperatorName(operator);
+//        }
         return list;
     }
 
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 8be43f43..f374cfc5 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -897,7 +897,8 @@ b.MinValue,b.ItemRemark,b.ItemType
         FinishFlag,
         itemResult
     from eam_workOrder_item
-    where site = #{site} and orderNo = #{orderNo}
+    where site = #{site}
+    and orderNo = #{orderNo}
 </select>
 
 <update id="cancelOrder">
@@ -1498,7 +1499,7 @@ b.MinValue,b.ItemRemark,b.ItemType
         AND OrderNo = #{orderNo}
     </update>
 
-    <!-- 检查系统操作人和审核人员是否一致 -->
+    <!-- 查询设备的历史记录 -->
     <select id="queryHistoryRecord" resultType="EamWorkOrderInData" parameterType="EamWorkOrderInData">
         SELECT
             ewo.OrderNo,
@@ -1507,13 +1508,16 @@ b.MinValue,b.ItemRemark,b.ItemType
             ewo.ActualDate,
             ewo.ObjectID,
             eo.ObjectDesc,
-            ewo.Remark
+            ewo.Remark,
+            dbo.eam_Get_eamAdminName(ewo.site,ewo.ActualOperator) ActualOperatorName,
+            ewo.checkResult
         FROM eam_workOrder as ewo
         LEFT JOIN eam_object as eo ON ewo.site = eo.site and ewo.ObjectID = eo.ObjectID
         WHERE ewo.site = #{site}
         AND ewo.ObjectID = #{objectID}
         AND ewo.FunctionType = #{functionType}
         AND ewo.Status = '已完工'
+        AND datediff(week, ewo.ActualDate, getdate()) = 0
     </select>
 
     <!-- 查询部门列表 -->
@@ -1522,7 +1526,7 @@ b.MinValue,b.ItemRemark,b.ItemType
             site,
             dept_id,
             dept_name
-        FROM view_empy_dept
+        FROM view_eam_department
         <where>
             site = #{site}
         <if test = "deptId != null and deptId != ''">
@@ -1544,10 +1548,12 @@ b.MinValue,b.ItemRemark,b.ItemType
     <!-- 查询部门列表 -->
     <select id="getDeptList" resultType="string" parameterType="string">
         SELECT
-            dept_id
-        FROM eam_admin_dept
-        WHERE site = #{site}
-        AND admin_id = #{adminID}
+            ved.dept_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
+        WHERE ead.site = #{site}
+        AND ead.admin_id = #{adminID}
     </select>
 
     <!-- 删除旧数据-->