From 515c490d0646224160ca5e922f5242f605fd8f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 14 Oct 2024 11:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AE=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=9B=B6=E4=BB=B6=E5=8F=B7=E8=8E=B7=E5=8F=96=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E9=9B=B6=E9=83=A8=E4=BB=B6=E5=90=8D=E7=A7=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/part/controller/LawsPartTypeController.java | 2 +- .../modules/laws/part/service/ILawsPartTypeService.java | 2 +- .../laws/part/service/impl/LawsPartTypeServiceImpl.java | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) 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)){