From f01c46f31e1c23a735aa5276c86ac387d89b7c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Tue, 7 Sep 2021 16:34:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/quality/model/InspectionTaskManage.java       | 9 +++++++++
 .../main/resources/mapper/InspectionTaskManageMapper.xml | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java b/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java
index 50a8e14c..9932210d 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java
+++ b/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java
@@ -30,6 +30,7 @@ public class InspectionTaskManage implements Serializable {
     private String modifyUser;
     private LocalDateTime modifiedDateTime;
     private String fullName;
+    private String resrceDescription;
 
     private List<InspectionTaskManageDetail> inspectionTaskDetailList;
 
@@ -224,4 +225,12 @@ public class InspectionTaskManage implements Serializable {
     public void setFullName(String fullName) {
         this.fullName = fullName;
     }
+
+    public String getResrceDescription() {
+        return resrceDescription;
+    }
+
+    public void setResrceDescription(String resrceDescription) {
+        this.resrceDescription = resrceDescription;
+    }
 }
diff --git a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
index 9fc0b6da..3fcc2c18 100644
--- a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
+++ b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
@@ -26,11 +26,12 @@
         <result column="MODIFY_USER" property="modifyUser" />
         <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
         <result column="FULL_NAME" property="fullName"/>
+        <result column="RESRCE_DESCRIPTION" property="resrceDescription"/>
     </resultMap>
 
     <select id="findInspectionTask" resultMap="BaseResultMap">
         SELECT  B.HANDLE, B.SITE, B.CATEGORY, B.TASK_NO, B.DESCRIPTION, B.STATUS, B.INSPECTION_ITEM_BO, B.WORK_CENTER, B.SHOP_ORDER, B.SFC, B.OPERATION, B.STEP_ID, B.RESRCE, B.RESULT, B.COMMENTS, B.CREATE_USER, B.CREATED_DATE_TIME, B.MODIFY_USER, B.MODIFIED_DATE_TIME,
-                M.ITEM, Z.DESCRIPTION  ITEM_DESCRIPTION,ZNU.FULL_NAME FULL_NAME
+                M.ITEM, Z.DESCRIPTION  ITEM_DESCRIPTION,ZNU.FULL_NAME FULL_NAME,RS.DESCRIPTION RESRCE_DESCRIPTION
         FROM Z_INSPECTION_TASK B
         INNER JOIN RESRCE RS ON B.SITE = RS.SITE AND RS.RESRCE = B.RESRCE
         LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = RS.HANDLE AND CF.ATTRIBUTE = 'CHECK_USR'