From da3863fcf53db4d3eca78a619655a49cb546dfbf Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 2 Jul 2024 15:08:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E6=96=87?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=A0=B9=E6=8D=AE=E7=9B=AE=E5=BD=95id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DocumentSplitController.java | 11 +++++++++++ .../service/IDocumentSplitService.java | 7 +++++++ .../service/impl/DocumentSplitServiceImpl.java | 14 ++++++++++++++ .../split/mapper/SarFileSplitItemsValEOMapper.java | 1 + .../mapper/xml/SarFileSplitItemsValEOMapper.xml | 13 ++++++++++++- .../service/ISarFileSplitItemsValEOService.java | 2 ++ .../impl/SarFileSplitItemsValEOServiceImpl.java | 5 +++++ 7 files changed, 52 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index 4ab6bb37..8f7772f4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -446,6 +446,17 @@ public class DocumentSplitController { * } */ + /** + * 标准拆分详情-查询条文详情根据目录id + * @return + */ + @AutoLog(value = "标准拆分详情-查询条文详情根据目录id") + @ApiOperation(value = "标准拆分详情-查询条文详情根据目录id") + @PostMapping("/queryItemValueByMenuId") + public Result queryItemValueByMenuId(String menuId) { + return Result.OK(MessageUtils.getMessage(ResultCommon.OK), documentSplitService.queryItemValueByMenuId(menuId)); + } + /** * 标准拆分详情-重新处理条文详情 * @param isAsmsImport diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java index e3466031..98f07dcd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java @@ -230,4 +230,11 @@ public interface IDocumentSplitService { * @param serialNumber */ void disposeItemVal(String isAsmsImport, String serialNumber); + + /** + * 标准拆分详情-查询条文详情根据目录id + * @param menuId + * @return + */ + String queryItemValueByMenuId(String menuId); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 07722005..16c6691c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -1468,6 +1468,20 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { } } + @Override + public String queryItemValueByMenuId(String menuId) { + LawsDocumentSplit lawsDocumentSplit = documentSplitMapper.selectOne(new LambdaQueryWrapper() + .eq(LawsDocumentSplit::getMenuId, menuId)); + if (!Objects.isNull(lawsDocumentSplit)){ + SarFileSplitItemsValEO sarFileSplitItemsValEO = new SarFileSplitItemsValEO(); + sarFileSplitItemsValEO.setItemId(lawsDocumentSplit.getId()); + sarFileSplitItemsValEO.setType("TEXT"); + List list = sarFileSplitItemsValEOService.queryList(sarFileSplitItemsValEO); + return list.stream().map(SarFileSplitItemsValEO::getItemContent).collect(Collectors.joining("\n\r")); + } + return ""; + } + private void manageData(Map resultMap, StringBuilder fieldsBuilder, List valuesList) { // 所有key(字段名) resultMap.forEach((k, v) -> { diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsValEOMapper.java b/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsValEOMapper.java index 0198b561..2da16fa3 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsValEOMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsValEOMapper.java @@ -54,4 +54,5 @@ public interface SarFileSplitItemsValEOMapper extends BaseMapper queryByPage(SarFileSplitItemsValEOPage page); + List queryList(@Param("sarFileSplitItemsValEO") SarFileSplitItemsValEO sarFileSplitItemsValEO); } diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml index 3479d3b6..12c2a4ec 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml @@ -310,5 +310,16 @@ - + diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsValEOService.java b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsValEOService.java index 09fce81b..138e2668 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsValEOService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsValEOService.java @@ -36,4 +36,6 @@ public interface ISarFileSplitItemsValEOService extends IService queryByPage(SarFileSplitItemsValEOPage page); int insertForeach(List itemValList); + + List queryList(SarFileSplitItemsValEO sarFileSplitItemsValEO); } diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsValEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsValEOServiceImpl.java index 1ab1404f..be6e636e 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsValEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsValEOServiceImpl.java @@ -102,4 +102,9 @@ public class SarFileSplitItemsValEOServiceImpl extends ServiceImpl queryList(SarFileSplitItemsValEO sarFileSplitItemsValEO) { + return dao.queryList(sarFileSplitItemsValEO); + } + }