From 42de537b14165e51f4b6bb879932ec31f89477e1 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 9 May 2024 17:28:33 +0800
Subject: [PATCH] =?UTF-8?q?2024-05-09=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/service/Impl/EamServiceImpl.java |  8 ++++----
 src/main/resources/mapper/pms/EamMapper.xml          | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 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 0caf6615..9eb98035 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
@@ -1815,7 +1815,7 @@ public class EamServiceImpl implements EamService {
             }
         }
        // eamMapper.closePlanWithCheck(inData);
-        if ("B".equals(inData.getFunctionType())) {
+        if ("B".equals(inData.getFunctionType()) || "A".equals(inData.getFunctionType())) {
             // 添加维保协同人员
             if (inData.getOperator() != null && !"".equals(inData.getOperator())){
                 String[] operatorList = inData.getOperator().split(";");
@@ -1825,7 +1825,7 @@ public class EamServiceImpl implements EamService {
                 }
             }
             // 如果维保异常则重新生成工单
-            if ("异常".equals(inData.getCheckResult())) {
+            if ("异常".equals(inData.getCheckResult()) && "B".equals(inData.getFunctionType())) {
                 // 获取旧工单的基础信息
                 EamWorkOrderInData oldDate = eamMapper.queryOldWorkOrderMessage(inData);
                 inData.setPlanOperator(oldDate.getPlanOperator());
@@ -1921,7 +1921,7 @@ public class EamServiceImpl implements EamService {
             Map<String, Object> resultMap2 = resultList2.get(0);
             String orderNo = "F" + DateUtil.getStringDate(new Date(),"yyMMdd") + resultMap2.get("serial_no");
             inData.setOrderNo(orderNo);
-            inData.setDocumentSource("设备维修");
+            inData.setDocumentSource("维修失败");
             // 创建工单
             eamMapper.saveDefectWorkOrder(inData);
             // 创建count表
@@ -2573,7 +2573,7 @@ public class EamServiceImpl implements EamService {
             eamMapper.updateWorkOrderItem(inData.getItemList().get(i));
         }
         // 修改维保协同人员
-        if ("B".equals(inData.getFunctionType())) {
+        if ("B".equals(inData.getFunctionType()) || "A".equals(inData.getFunctionType())) {
             // 删除之前数据
             eamMapper.delOperator(inData);
             // 新增数据
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index ae1b5a7d..72684a50 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -791,6 +791,9 @@
             <if test='query.functionType == "A" and query.searchType == "reportCheck"'>
                 and getDate() >= dbo.compare_date(ewo.task_start_date)
             </if>
+            <if test="query.urgency != null and query.urgency != ''">
+                AND b.urgency = #{query.urgency}
+            </if>
             AND a.FunctionType = #{query.functionType}
         </where>
         ORDER BY a.CreateDate,
@@ -889,6 +892,12 @@
                 <if test="query.endDate != null ">
                     AND #{query.endDate} >= a.PlanDate
                 </if>
+                <if test="query.urgency != null and query.urgency != ''">
+                    AND b.urgency = #{query.urgency}
+                </if>
+                <if test="query.result != null and query.result != ''">
+                    AND a.result = #{query.result}
+                </if>
                 and a.FunctionType =#{query.functionType}
             </where>
             ORDER BY a.PlanDate,
@@ -1431,6 +1440,9 @@
             <if test="query.endDate != null ">
             AND #{query.endDate} >= a.defectDate
             </if>
+            <if test="query.urgency != null and query.urgency != ''">
+                AND a.urgency = #{query.urgency}
+            </if>
             and a.FunctionType = #{query.functionType}
         </where>
         ORDER BY a.DefectDate,