From ca25362497cfafc13e12ac9e70f62fbfee659cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Thu, 5 Aug 2021 14:35:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9=E6=8A=8A?=
 =?UTF-8?q?=E4=B8=8D=E8=89=AF=E4=BB=A3=E7=A0=81=E6=94=B9=E4=B8=BA=E4=B8=8D?=
 =?UTF-8?q?=E8=89=AF=E4=BB=A3=E7=A0=81=E7=9A=84=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/anomaly/dto/AbnormalBillDto.java   | 10 +++++++++
 .../service/impl/AbnormalBillServiceImpl.java |  1 -
 .../resources/mapper/AbnormalBillMapper.xml   | 21 ++++++++++++-------
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java
index 4fbfe94b..27df7b40 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java
@@ -42,6 +42,8 @@ public class AbnormalBillDto extends AbnormalBill {
 
     private String resolveRemark;
 
+    private String ncCodeDescription;
+
     public String getSeq() {
         return seq;
     }
@@ -123,4 +125,12 @@ public class AbnormalBillDto extends AbnormalBill {
     public void setReportUser(String reportUser) {
         this.reportUser = reportUser;
     }
+
+    public String getNcCodeDescription() {
+        return ncCodeDescription;
+    }
+
+    public void setNcCodeDescription(String ncCodeDescription) {
+        this.ncCodeDescription = ncCodeDescription;
+    }
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index f6537990..8978e5da 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -310,7 +310,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     public List<AbnormalBillDto> backLog(AbnormalBillDto abnormalBillDto) {
         String language = LocaleContextHolder.getLocale().getLanguage();
         return abnormalBillMapper.backLog(abnormalBillDto, language);
-
     }
 
     @Override
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 5615b27c..f1081577 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -56,6 +56,7 @@
         <result column="CONFIRM_USER" property="confirmUser"/>
         <result column="RESOLVE_REMARK" property="resolveRemark"/>
         <result column="REPORT_SEND_USER_GROUP" property="reportSendUserGroup"/>
+        <result column="NC_CODE_DESCRIPTION" property="ncCodeDescription"/>
     </resultMap>
 
     <resultMap id="scrapDto" type="com.foreverwin.mesnac.common.dto.ScrapDto" >
@@ -875,13 +876,17 @@
 
 
     <select id="backLog" resultMap="abnormalBillDto">
-        SELECT ROW_NUMBER() OVER(ORDER BY zab.ABNORMAL_NO ASC) SEQ,zab.ABNORMAL_NO ABNORMAL_NO,
-        zab.STATUS STATUS, it.DESCRIPTION ITEM_DESCRIPTION, zab.CREATED_DATE_TIME CREATED_DATE_TIME,zab.RESPONSE_DATE_TIME RESPONSE_DATE_TIME
-        ,zab.CREATED_USER CREATED_USER,
-        zab.NC_CODE NC_CODE,zab.PB_DESCRIPTION PB_DESCRIPTION
-        FROM Z_ABNORMAL_BILL zab
-        LEFT JOIN ITEM i ON zab.ITEM_BO = i.HANDLE
-        LEFT JOIN ITEM_T it ON i.HANDLE = it.ITEM_BO AND it.LOCALE = #{language}
+        SELECT ROW_NUMBER() OVER(ORDER BY ZAB.ABNORMAL_NO ASC) SEQ,ZAB.ABNORMAL_NO ABNORMAL_NO,
+        ZAB.STATUS STATUS, IT.DESCRIPTION ITEM_DESCRIPTION, ZAB.CREATED_DATE_TIME CREATED_DATE_TIME,
+        ZAB.RESPONSE_DATE_TIME RESPONSE_DATE_TIME,
+        ZAB.CREATED_USER CREATED_USER,
+        ZAB.NC_CODE NC_CODE,ZAB.PB_DESCRIPTION PB_DESCRIPTION,
+        SUBSTR(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO),0,LENGTH(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO))-1) NC_CODE_DESCRIPTION
+        FROM Z_ABNORMAL_BILL ZAB
+        LEFT JOIN ITEM I ON ZAB.ITEM_BO = I.HANDLE
+        LEFT JOIN ITEM_T IT ON I.HANDLE = IT.ITEM_BO AND IT.LOCALE = #{language}
+        LEFT JOIN Z_ABNORMAL_NC_CODE ZANC ON ZANC.ABNORMAL_BILL_BO = ZAB.HANDLE
+        LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = 'NCCodeBO:'|| ZAB.SITE || ',' || ZANC.NC_CODE  AND NCT.LOCALE = #{language}
         <where>
             <if test="abnormalBill != null">
                 <if test="abnormalBill.site != null and abnormalBill.site != ''">
@@ -916,6 +921,8 @@
                 </if>
             </if>
         </where>
+        GROUP BY zab.ABNORMAL_NO,zab.STATUS,it.DESCRIPTION,zab.CREATED_DATE_TIME,zab.RESPONSE_DATE_TIME,
+        zab.CREATED_USER,zab.NC_CODE,zab.PB_DESCRIPTION
     </select>
 
     <select id="findAllByAbnormalNoDevice" resultMap="abnormalBillDto">