diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java index 952312f0..f3f2efa0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java @@ -201,7 +201,7 @@ public class LawsPartTypeController { @ApiOperationSupport(order = 2) @Translation public Result> queryByPartNum(LawsPartType lawsPartType) { - List result = lawsPartTypeService.queryByPartNum(lawsPartType.getPartNum()); + List result = lawsPartTypeService.queryByPartNum(lawsPartType); return Result.OK(result); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java index 4409786b..395fe5c6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java @@ -30,7 +30,7 @@ public interface ILawsPartTypeService extends IService { ModelAndView export(LawsPartType lawsPartType, HttpServletRequest request); - List queryByPartNum(String partNum); + List queryByPartNum(LawsPartType lawsPartType); List queryByPartNumList(String partNum); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java index 2488b5d6..06f2de49 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java @@ -189,15 +189,20 @@ public class LawsPartTypeServiceImpl extends ServiceImpl queryByPartNum(String partNum) { + public List queryByPartNum(LawsPartType lawsPartType) { + if(StringUtils.isEmpty(lawsPartType.getPartNum())){ + throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED); + } LambdaQueryWrapper queryLawsPartInfo = new LambdaQueryWrapper<>(); - queryLawsPartInfo.eq(LawsPartInfo::getPartNum,partNum); + queryLawsPartInfo.eq(LawsPartInfo::getPartNum,lawsPartType.getPartNum()); LawsPartInfo lawsPartInfo = lawsPartInfoService.getOne(queryLawsPartInfo,false); if(Objects.isNull(lawsPartInfo)){ throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); } QueryWrapper queryLawsPartRelevance = new QueryWrapper<>(); queryLawsPartRelevance.gt("FIND_IN_SET('" + lawsPartInfo.getFndGpc() + "',fnd_gpc)", 0); + queryLawsPartRelevance.like(!StringUtils.isEmpty(lawsPartType.getRegPartNameCn()),"reg_part_name_cn", + lawsPartType.getRegPartNameCn()); queryLawsPartRelevance.orderByDesc("create_time"); List lawsPartRelevanceList = lawsPartRelevanceService.list(queryLawsPartRelevance); if(CollectionUtils.isEmpty(lawsPartRelevanceList)){