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 5a798fe5..ead031df 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 @@ -1,16 +1,14 @@ package com.foreverwin.mesnac.meapi.controller; -import com.foreverwin.modular.core.util.R; -import com.foreverwin.modular.core.util.FrontPage; -import com.foreverwin.modular.core.util.CommonMethods; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.web.bind.annotation.RequestMapping; +import com.foreverwin.mesnac.meapi.model.NcCode; +import com.foreverwin.mesnac.meapi.service.NcCodeService; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.foreverwin.mesnac.meapi.service.NcCodeService; -import com.foreverwin.mesnac.meapi.model.NcCode; import java.util.List; /** @@ -120,4 +118,13 @@ public class NcCodeController { public R removeByIds(List ids){ return R.ok(ncCodeService.removeByIds(ids)); } + + /** + * 根据不良代码组找出它下面的所有的不良代码,并且是主要代码 + */ + @ResponseBody + @GetMapping("/findNcByNG") + public R findNcByNG(String messageType){ + return R.ok(ncCodeService.findNcByNG(messageType)); + } } \ No newline at end of file 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 da99fd70..c935fdb2 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 @@ -1,9 +1,12 @@ package com.foreverwin.mesnac.meapi.mapper; -import com.foreverwin.mesnac.meapi.model.NcCode; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.meapi.model.NcCode; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** *

* Mapper 接口 @@ -14,5 +17,5 @@ import org.springframework.stereotype.Repository; */ @Repository public interface NcCodeMapper extends BaseMapper { - + List findNcByNG(@Param("site")String site, @Param("locale")String locale, @Param("messageType")String messageType); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java index a7bd3a9b..725fdb16 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java @@ -40,6 +40,8 @@ public class NcCode extends Model { private String ncCategory; @TableField("DPMO_CATEGORY_BO") private String dpmoCategoryBo; + @TableField(exist = false) + private String description; public String getHandle() { @@ -132,6 +134,13 @@ public static final String NC_CATEGORY = "NC_CATEGORY"; public static final String DPMO_CATEGORY_BO = "DPMO_CATEGORY_BO"; + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } @Override protected Serializable pkVal() { 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 ca6c319e..99d8a3a1 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 @@ -25,4 +25,6 @@ public interface NcCodeService extends IService { IPage selectPage(FrontPage frontPage, NcCode ncCode); List selectList(NcCode ncCode); + + List findNcByNG(String messageType); } \ 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 d7dcb67d..5204f325 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 @@ -1,17 +1,20 @@ package com.foreverwin.mesnac.meapi.service.impl; -import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.meapi.model.NcCode; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.meapi.mapper.NcCodeMapper; +import com.foreverwin.mesnac.meapi.model.NcCode; import com.foreverwin.mesnac.meapi.service.NcCodeService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.FrontPage; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; + /** *

* 服务实现类 @@ -42,5 +45,12 @@ public class NcCodeServiceImpl extends ServiceImpl impleme return super.list(queryWrapper); } + @Override + public List findNcByNG(String messageType) { + String site = CommonMethods.getSite(); + String locale = LocaleContextHolder.getLocale().getLanguage(); + return ncCodeMapper.findNcByNG(site,locale,messageType); + } + } \ 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 0da959c7..866c2cd2 100644 --- a/meapi/src/main/resources/mapper/NcCodeMapper.xml +++ b/meapi/src/main/resources/mapper/NcCodeMapper.xml @@ -13,6 +13,7 @@ + @@ -215,6 +216,15 @@ ${ew.sqlSegment} + INSERT INTO NC_CODE