From 0335019750e3630342ce6e9049ab24e7d76a2770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Fri, 25 Jun 2021 15:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8F=90=E6=8A=A5=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8D=E8=89=AF=E4=BB=A3=E7=A0=81=E5=92=8C=E4=B8=8D?=
 =?UTF-8?q?=E8=89=AF=E4=BB=A3=E7=A0=81=E7=BB=84=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meapi/controller/NcCodeController.java    | 18 ++++++++++--
 .../mesnac/meapi/mapper/NcCodeMapper.java     |  2 ++
 .../mesnac/meapi/service/NcCodeService.java   |  2 ++
 .../meapi/service/impl/NcCodeServiceImpl.java |  7 +++++
 .../main/resources/mapper/NcCodeMapper.xml    | 28 +++++++++++++------
 5 files changed, 46 insertions(+), 11 deletions(-)

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 ead031df..f90f5256 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
@@ -122,9 +122,23 @@ public class NcCodeController {
     /**
      * 根据不良代码组找出它下面的所有的不良代码，并且是主要代码
      */
-    @ResponseBody
     @GetMapping("/findNcByNG")
     public R findNcByNG(String messageType){
         return R.ok(ncCodeService.findNcByNG(messageType));
     }
-}
\ No newline at end of file
+
+    @GetMapping("findSecondaryNcByNc")
+    public R findSecondaryNcByNcI(String ncCode){
+        return R.ok(ncCodeService.findSecondaryNcByNc(ncCode));
+    }
+}
+
+
+
+
+
+
+
+
+
+
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 c935fdb2..793b3f7d 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
@@ -18,4 +18,6 @@ import java.util.List;
 @Repository
 public interface NcCodeMapper extends BaseMapper<NcCode> {
     List<NcCode> findNcByNG(@Param("site")String site, @Param("locale")String locale, @Param("messageType")String messageType);
+
+    List<NcCode> findSecondaryNcByNc(@Param("site")String site,@Param("locale")String locale,@Param("ncCode")String ncCode);
 }
\ 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 99d8a3a1..3fd4400a 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
@@ -27,4 +27,6 @@ public interface NcCodeService extends IService<NcCode> {
     List<NcCode> selectList(NcCode ncCode);
 
     List<NcCode> findNcByNG(String messageType);
+
+    List<NcCode> findSecondaryNcByNc(String ncCode);
 }
\ 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 5204f325..5197334a 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
@@ -52,5 +52,12 @@ public class NcCodeServiceImpl extends ServiceImpl<NcCodeMapper, NcCode> impleme
         return ncCodeMapper.findNcByNG(site,locale,messageType);
     }
 
+    @Override
+    public List<NcCode> findSecondaryNcByNc(String ncCode) {
+        String site = CommonMethods.getSite();
+        String locale = LocaleContextHolder.getLocale().getLanguage();
+        return ncCodeMapper.findSecondaryNcByNc(site,locale,ncCode);
+    }
+
 
 }
\ 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 866c2cd2..c73916cb 100644
--- a/meapi/src/main/resources/mapper/NcCodeMapper.xml
+++ b/meapi/src/main/resources/mapper/NcCodeMapper.xml
@@ -216,15 +216,6 @@
             ${ew.sqlSegment}
         </if>
     </select>
-    <select id="findNcByNG" resultMap="BaseResultMap">
-        SELECT NC.NC_CODE , NCT.DESCRIPTION
-        FROM NC_GROUP NG
-        INNER JOIN NC_GROUP_MEMBER NGM ON NG.HANDLE = NGM.NC_GROUP_BO
-        INNER JOIN NC_CODE NC ON NC.HANDLE = NGM.NC_CODE_OR_GROUP_GBO
-        INNER JOIN NC_CODE_DEF NCD ON NC.HANDLE = NCD.NC_CODE_OR_GROUP_GBO AND NCD.CAN_BE_PRIMARY_CODE = 'true'
-        INNER JOIN NC_CODE_T NCT ON  NCT.NC_CODE_BO = NC.HANDLE AND NCT.LOCALE = #{locale}
-        WHERE NG.NC_GROUP = #{messageType} AND NG.SITE = #{site}
-    </select>
 
     <insert id="insert" parameterType="com.foreverwin.mesnac.meapi.model.NcCode">
         INSERT INTO NC_CODE
@@ -353,4 +344,23 @@
 
     <!-- BaseMapper标准查询/修改/删除 -->
 
+    <select id="findNcByNG" resultMap="BaseResultMap">
+        SELECT NC.NC_CODE , NCT.DESCRIPTION
+        FROM NC_GROUP NG
+                 INNER JOIN NC_GROUP_MEMBER NGM ON NG.HANDLE = NGM.NC_GROUP_BO
+                 INNER JOIN NC_CODE NC ON NC.HANDLE = NGM.NC_CODE_OR_GROUP_GBO
+                 INNER JOIN NC_CODE_DEF NCD ON NC.HANDLE = NCD.NC_CODE_OR_GROUP_GBO AND NCD.CAN_BE_PRIMARY_CODE = 'true'
+                 INNER JOIN NC_CODE_T NCT ON  NCT.NC_CODE_BO = NC.HANDLE AND NCT.LOCALE = #{locale}
+        WHERE NG.NC_GROUP = #{messageType} AND NG.SITE = #{site}
+    </select>
+
+    <select id="findSecondaryNcByNc" resultMap="BaseResultMap">
+        SELECT SUBSTR(nsc.NC_CODE_OR_GROUP_GBO, instr(nsc.NC_CODE_OR_GROUP_GBO,',')+1) NC_CODE,nct.DESCRIPTION
+        FROM NC_CODE nc
+        INNER JOIN NC_CODE_DEF ncd ON NC.HANDLE = NCD.NC_CODE_OR_GROUP_GBO AND NCD.CAN_BE_PRIMARY_CODE = 'true'
+        INNER JOIN NC_SECONDARY_CODE nsc ON nsc.NC_CODE_DEF_BO = ncd.HANDLE
+        INNER JOIN NC_CODE_T nct ON nct.NC_CODE_BO = nsc.NC_CODE_OR_GROUP_GBO AND NCT.LOCALE = #{locale}
+        WHERE nc.NC_CODE = #{ncCode} AND nc.SITE = #{site}
+    </select>
+
 </mapper>