From c7018f197548981872be368902a0dadf240a3bc4 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 22 Sep 2023 17:37:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=9C=AA?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=B8=8A=E5=B9=B3=E5=8F=B0=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLibraryBaseController.java | 2 +- .../service/IProjectLibraryBaseService.java | 2 +- .../impl/ProjectLibraryBaseServiceImpl.java | 67 ++++++++++++------- 3 files changed, 45 insertions(+), 26 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index bea4e4c85..8eff66690 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -83,7 +83,7 @@ public class ProjectLibraryBaseController extends JeroController listPlatformAll(@RequestBody Map params) { - List> mapList = projectLibraryBaseService.listPlatformAll(params); + Map mapList = projectLibraryBaseService.listPlatformAll(params); return Result.OK(params.get("cut").toString(),mapList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index d6d57dbae..49fe9059a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -98,7 +98,7 @@ public interface IProjectLibraryBaseService extends IService * @param params * @return */ - List> listPlatformAll(Map params); + Map listPlatformAll(Map params); // IPage queryPageList(Map params); /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 6654e445d..ba55769c4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -1377,6 +1377,35 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl lawsInventoryPlatformEOS = new ArrayList<>(); + for (Map map : mapListOne) { + LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO(); + inventoryPlatformEO.setCreateTime(new Date()); + inventoryPlatformEO.setUpdateTime(new Date()); + inventoryPlatformEO.setLawsInventoryId((String) map.get("lawsInventoryId")); + List projectLawsInventoryEOS = (List) map.get("result"); + inventoryPlatformEO.setPlatformLawsInventoryId(projectLawsInventoryEOS.get(0).getId()); + lawsInventoryPlatformEOS.add(inventoryPlatformEO); + } + + if (!lawsInventoryPlatformEOS.isEmpty()) { + lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS); + } + } + //法规清单未匹配上平台件的提示语 + String html = getMsg(cut, sysDictItemList, emptyList); + + Map map = new HashMap<>(); + map.put("msg",html); + map.put("result",mapList); + return map; + } + + @NotNull + private String getMsg(String cut, List sysDictItemList, List emptyList) { List msgList = new ArrayList<>(); //未匹配上法规清单 if(ObjectUtils.isNotEmpty(emptyList)){ @@ -1402,35 +1431,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl"; } - if(!mapListOne.isEmpty()){ - //匹配一条平台件时直接新增 - List lawsInventoryPlatformEOS = new ArrayList<>(); - for (Map map : mapListOne) { - LawsInventoryPlatformEO inventoryPlatformEO = new LawsInventoryPlatformEO(); - inventoryPlatformEO.setCreateTime(new Date()); - inventoryPlatformEO.setUpdateTime(new Date()); - inventoryPlatformEO.setLawsInventoryId((String) map.get("lawsInventoryId")); - List projectLawsInventoryEOS = (List) map.get("result"); - inventoryPlatformEO.setPlatformLawsInventoryId(projectLawsInventoryEOS.get(0).getId()); - lawsInventoryPlatformEOS.add(inventoryPlatformEO); - } - - if (!lawsInventoryPlatformEOS.isEmpty()) { - lawsInventoryPlatformEOService.saveBatch(lawsInventoryPlatformEOS); - } - } - Map map = new HashMap<>(); - map.put("msg",html); - map.put("result",mapList); - return map; + return html; } + /** * 不勾选法规清单进行关联平台件 * * @return */ @Override - public List> listPlatformAll(Map params) { + public Map listPlatformAll(Map params) { String cut = (String) params.get("cut");// String projectLibraryIds = (String) params.get("projectLibraryIds");//法规清单id String platformProjectLibraryIds = (String) params.get("platformProjectLibraryIds");//平台件法规id @@ -1462,7 +1472,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl sysDictItemList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue()); List> mapList = new ArrayList<>(); List> mapListOne = new ArrayList<>(); - List projectLawsInventoryEOList = new ArrayList<>(); + List emptyList = new ArrayList<>(); for (ProjectLawsInventoryEO projectLawsInventoryEO : lawsInventoryEOList) { Map map = new HashMap<>(); List projectLawsInventoryEOS = new ArrayList<>(); @@ -1502,6 +1512,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl 1){ @@ -1533,7 +1546,13 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("msg",html); + map.put("result",mapList); + return map; } private void hearSort(Map params, List resultLast) {