From 7834d4baa0c014f4523211931f33ee57e8c047cf Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Wed, 18 Aug 2021 14:49:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equip/model/ResourceRepairTask.java       | 35 +++++++++++++++++++
 .../impl/ResourceRepairTaskServiceImpl.java   |  4 ++-
 .../mapper/ResourceRepairTaskMapper.xml       | 13 +++++--
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java
index 4870d081..114078b9 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java
@@ -302,6 +302,41 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
     */
    @TableField(exist = false)
    private String reportUserName;
+   /**
+    * 取消代码描述
+    */
+   @TableField(exist = false)
+   private String cancelCodeDescription;
+   /**取消用户名称**/
+   @TableField(exist = false)
+   private String cancelUserName;
+   /**不良代码名称**/
+   @TableField(exist = false)
+   private String ncCodeNoDescription;
+
+   public String getNcCodeNoDescription() {
+      return ncCodeNoDescription;
+   }
+
+   public void setNcCodeNoDescription(String ncCodeNoDescription) {
+      this.ncCodeNoDescription = ncCodeNoDescription;
+   }
+
+   public String getCancelUserName() {
+      return cancelUserName;
+   }
+
+   public void setCancelUserName(String cancelUserName) {
+      this.cancelUserName = cancelUserName;
+   }
+
+   public String getCancelCodeDescription() {
+      return cancelCodeDescription;
+   }
+
+   public void setCancelCodeDescription(String cancelCodeDescription) {
+      this.cancelCodeDescription = cancelCodeDescription;
+   }
 
    public String getReportUserName() {
       return reportUserName;
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
index 58b96371..0adbf540 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
@@ -209,7 +209,9 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                 repairTask.setCancelCode(resourceRepairTask.getCancelCode());
                 repairTask.setCancelDescription(resourceRepairTask.getCancelDescription());
                 repairTask.setCancelDate(LocalDateTime.now());
-                repairTask.setCancelUser(CommonMethods.getUser());
+                repairTask.setCancelUser(user);
+                NwaUser userByUserName = nwaUserService.findUserByUserName(user);
+                repairTask.setCancelUserName(userByUserName.getFullName());
                 break;
             case "502":
                 if (repairTask.getWaitStartDate() != null){
diff --git a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
index b2f3482e..4c8a728b 100644
--- a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
+++ b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
@@ -883,11 +883,14 @@
         <!--批量获取维修任务-->
     <select id="findResourceRepairTaskList" resultType="com.foreverwin.mesnac.equip.model.ResourceRepairTask">
         SELECT DISTINCT RRT.*, ZNU.FULL_NAME AS REPORT_USER_NAME, R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
-        WCMA.WORK_CENTER_BO AS WORK_CENTER_BO,
+        WCMA.WORK_CENTER_BO AS WORK_CENTER_BO,NCT.DESCRIPTION AS CANCEL_CODE_DESCRIPTION, ZNU2.FULL_NAME AS CANCEL_USER_NAME,
         WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION
         FROM
         WIP.Z_RESOURCE_REPAIR_TASK RRT
         LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = RRT.REPORT_USER
+        LEFT JOIN NC_CODE NC ON NC.NC_CODE = RRT.CANCEL_CODE
+        LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE
+        LEFT JOIN Z_NWA_USER ZNU2 ON ZNU2.USER_NAME = RRT.CANCEL_USER
         INNER JOIN WIP.RESRCE R ON RRT.SITE = R.SITE AND R.RESRCE = RRT.RESOURCE_NO
         LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
         LEFT JOIN WIP.WORK_CENTER_MEMBER WCMA ON WCMA.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO
@@ -921,14 +924,20 @@
         <if test="compareEndDate != null and compareEndDate != ''">
             AND RRT.PLAN_START_DATE &lt;= (TO_DATE( #{compareEndDate},'yyyy-MM-dd hh24:mi-ss' ) - 8/24 )
         </if>
+        ORDER BY PLAN_START_DATE , ACTUAL_START_DATE
     </select>
         <!--根据维修任务HANDLE获取维修任务详细数据-->
     <select id="findResourceRepairTaskByHandleAndSite" resultType="com.foreverwin.mesnac.equip.model.ResourceRepairTask">
-        SELECT DISTINCT  RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
+        SELECT DISTINCT  RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO, NCT.DESCRIPTION AS CANCEL_CODE_DESCRIPTION,
+                         ZNU.FULL_NAME AS REPORT_USER_NAME, ZNU2.FULL_NAME AS CANCEL_USER_NAME ,
                         WCMA.WORK_CENTER_BO AS WORK_CENTER_BO,WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION
         FROM
             WIP.Z_RESOURCE_REPAIR_TASK RRT
                 LEFT JOIN WIP.RESRCE R ON R.RESRCE = RRT.RESOURCE_NO AND R.SITE = RRT.SITE
+                LEFT JOIN NC_CODE NC ON NC.NC_CODE = RRT.CANCEL_CODE
+                LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE
+                LEFT JOIN WIP.Z_NWA_USER ZNU ON ZNU.USER_NAME = RRT.REPORT_USER
+                LEFT JOIN WIP.Z_NWA_USER ZNU2 ON ZNU2.USER_NAME = RRT.CANCEL_USER
                 LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
                 LEFT JOIN WIP.WORK_CENTER_MEMBER WCMA ON WCMA.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO
                 LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO