From 8ccdff7a6c85b9b9119976b8e4b60cbe880f05dd Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 1 Aug 2024 20:29:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=A4=9A=E9=80=89=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BC=B9=E6=A1=86):=20=E6=A0=87=E5=87=86=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E6=A0=91=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/mapper/xml/LawsCommonMapper.xml | 6 ++++++ .../common/service/impl/LawsCommonServiceImpl.java | 10 ++++++++++ .../laws/common/vo/ManyStandardSelectionBoxVO.java | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml index 07dfeed8..9780312c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml @@ -104,6 +104,12 @@ standard_number <> #{item} + + AND id in + + #{item} + + GROUP BY id diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index e0e9fa64..6505ada7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1433,6 +1433,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService { **/ @Override public IPage getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, Integer pageNo, Integer pageSize) { + if (StringUtils.isNotBlank(selectionBoxVO.getStandardSystem())){ + List list = Arrays.asList(selectionBoxVO.getStandardSystem().split(",")); + List lawsNodeRelationList = lawsNodeRelationService.list( + new LambdaQueryWrapper().in(LawsNodeRelation::getNodeId, list)); + if (CollectionUtils.isNotEmpty(lawsNodeRelationList)){ + String ids = lawsNodeRelationList.stream() + .map(LawsNodeRelation::getUniqueRelationFlag).collect(Collectors.joining(",")); + selectionBoxVO.setIds(ids); + } + } Page page = new Page<>(pageNo, pageSize); IPage manyStandardSelectionBox = lawsCommonMapper.getManyStandardSelectionBox(page, selectionBoxVO); for (ManyStandardSelectionBox data : manyStandardSelectionBox.getRecords()) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java index 096f7b83..0375c98d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java @@ -34,4 +34,10 @@ public class ManyStandardSelectionBoxVO { @ApiModelProperty(value = "拆分状态") private java.lang.String splitState; + + @ApiModelProperty(value = "标准结构树") + private String standardSystem; + + @ApiModelProperty(value = "ids") + private String ids; }