From 45b103cdc578595cd3d4d5c135b837cca6f70af9 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Thu, 12 Aug 2021 21:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8D=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/meapi/controller/NcCodeController.java | 11 +++++++++++
 .../mesnac/meapi/mapper/NcCodeMapper.java         |  2 ++
 .../mesnac/meapi/service/NcCodeService.java       |  2 ++
 .../meapi/service/impl/NcCodeServiceImpl.java     |  9 +++++++++
 meapi/src/main/resources/mapper/NcCodeMapper.xml  | 15 +++++++++++++++
 5 files changed, 39 insertions(+)

diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java
index 951fc9b2..b55e1422 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NcCodeController.java
@@ -149,6 +149,17 @@ public class NcCodeController {
     public R findNcCodeByNcGroup(NcGroup ncGroup){
         return R.ok(ncCodeService.findNcCodeByNcGroup(ncGroup));
     }
+
+    /**
+     * 根据不合格代码组查询不合格代码
+     * @param ncGroup
+     * @return
+     */
+    @GetMapping("/findNcCodeByNcGroupList")
+    public R findNcCodeByNcGroupList(String ncGroup){
+        return R.ok(ncCodeService.findNcCodeByNcGroupList(ncGroup));
+    }
+
 }
 
 
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java
index 638b8ae5..3f18c5ee 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java
@@ -40,4 +40,6 @@ public interface NcCodeMapper extends BaseMapper<NcCode> {
 
 
     List<NcCodeDto> findNcCodeDescriptionByNcCode(@Param("site")String site, @Param("locale")String locale, @Param("ncCode")String[] ncCode);
+
+    List<NcCodeDto> findNcCodeByNcGroupList(@Param("site")String site, @Param("locale")String locale, @Param("ncGroup")String[] ncGroup);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java
index a0beafd4..356127f7 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NcCodeService.java
@@ -38,4 +38,6 @@ public interface NcCodeService extends IService<NcCode> {
     List<NcCode> findNcCodeByNcGroup(NcGroup ncGroup);
 
     List<NcCodeDto> findNcCodeDescriptionByNcCode(String ncCode);
+
+    List<NcCodeDto> findNcCodeByNcGroupList(String ncGroup);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java
index b9d18b3c..b088a713 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NcCodeServiceImpl.java
@@ -91,5 +91,14 @@ public class NcCodeServiceImpl extends ServiceImpl<NcCodeMapper, NcCode> impleme
         return ncCodeMapper.findNcCodeDescriptionByNcCode(site,locale,split);
     }
 
+    @Override
+    public List<NcCodeDto> findNcCodeByNcGroupList(String ncCode) {
+        String site = CommonMethods.getSite();
+        String locale = LocaleContextHolder.getLocale().getLanguage();
+        String[] split = ncCode.split(",");
+
+        return ncCodeMapper.findNcCodeByNcGroupList(site,locale,split);
+    }
+
 
 }
\ No newline at end of file
diff --git a/meapi/src/main/resources/mapper/NcCodeMapper.xml b/meapi/src/main/resources/mapper/NcCodeMapper.xml
index f5408f42..82803b6f 100644
--- a/meapi/src/main/resources/mapper/NcCodeMapper.xml
+++ b/meapi/src/main/resources/mapper/NcCodeMapper.xml
@@ -434,4 +434,19 @@
             </foreach>
         </where>
     </select>
+
+    <select id="findNcCodeByNcGroupList" resultMap="ncCodeDto">
+        SELECT NC.NC_CODE NC_CODE, NCT.DESCRIPTION DESCRIPTION,NG.NC_GROUP NG_GROUP,NG.DESCRIPTION NG_DESCRIPTION
+        FROM NC_CODE NC
+        LEFT JOIN NC_CODE_T NCT ON NC.HANDLE = NCT.NC_CODE_BO AND NCT.LOCALE = #{locale}
+        LEFT JOIN NC_GROUP_MEMBER NGM ON NGM.NC_CODE_OR_GROUP_GBO = NC.HANDLE
+        LEFT JOIN NC_GROUP NG ON NG.HANDLE = NGM.NC_GROUP_BO
+        <where>
+            NC.SITE = #{site} AND NG.NC_GROUP IN
+            <foreach collection="ncGroup" open="(" close=")" item="item" separator=",">
+                UPPER(#{item})
+            </foreach>
+        </where>
+    </select>
+
 </mapper>