From a32348faa76f7c7a4c864bb3d4a395f049f587c0 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 4 Jul 2022 10:04:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 27 ++++++++++++++----- .../xml/ParamsCollectManifestEOMapper.xml | 3 +++ .../IParamsCollectManifestEOService.java | 6 ++++- .../ParamsCollectManifestEOServiceImpl.java | 24 +++++++++++++++-- 4 files changed, 51 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index b3e4b0bed..7eea4e988 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -113,21 +113,21 @@ public class ParamsCollectManifestEOController extends JeroController save(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) { - boolean isSuccess = paramsCollectManifestEOService.save(paramsCollectManifestVO.getConfigDataList()); + boolean isSuccess = paramsCollectManifestEOService.save(paramsCollectManifestVO.getConfigDataList(), paramsCollectManifestVO.getParamsManifestId()); if (isSuccess) { - return Result.OK("保存成功！"); + return Result.OK("暂存成功！"); } else { - return Result.error("保存失败！"); + return Result.error("暂存失败！"); } } @@ -388,6 +388,21 @@ public class ParamsCollectManifestEOController extends JeroController getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) { + List lockedConfigIdList = paramsCollectManifestEOService.getLockedConfigIdList(paramsCollectManifestVO); + return Result.OK(lockedConfigIdList); + } + /** * 冻结配置 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 0952a335f..5709b8d47 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -48,6 +48,9 @@ AND duty_territory = #{paramsCollectManifestEO.dutyTerritory} + + AND state = #{paramsCollectManifestEO.state} + AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 7da49f229..bdfb056a0 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -85,9 +85,10 @@ public interface IParamsCollectManifestEOService extends IService> configDataList); + boolean save(List> configDataList, String paramsManifestId); /** * 查询清单所用模版参数项列表（过滤清单已添加的参数项） @@ -127,6 +128,9 @@ public interface IParamsCollectManifestEOService extends IService> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO); + // 冻结配置-回显已冻结的配置 + List getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO); + // 冻结配置 boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index d3b92f15d..7b54bd6f6 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -747,8 +747,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> configDataList) { + public boolean save(List> configDataList, String paramsManifestId) { List newConfigDataEOList = new ArrayList<>(); + List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列 + List paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); + List paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据 // 处理数据 for (Map map : configDataList) { @@ -768,7 +771,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> paramsConfigDataVOList = (List>) paramsConfigDataMap.get("list"); // 判断是新增还是修改 - ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId); +// ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId); + ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId,paramsConfigDataEOList); if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { paramsConfigDataEO.setId(oldConfigDataEO.getId()); @@ -1323,6 +1327,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) { + String paramsManifestId = paramsCollectManifestVO.getParamsManifestId(); + + // 查询配置列 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId); + queryWrapper.eq(ParamsConfigEO::getIsLock, ConfigLockEnum.YES.getValue()); // 指定查询非冻结配置 + queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq); + List paramsConfigEOList = paramsConfigEOService.list(queryWrapper); + + List lockedConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); + + return lockedConfigIdList; + } + @Override public boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) { if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {