From 6629d4bf74c6e4fa7f092e76155e4ad2eb8b1da2 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 12 Apr 2023 17:23:27 +0800 Subject: [PATCH] =?UTF-8?q?UAT=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E5=BA=8F=E5=8F=B743=EF=BC=8C=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ectCertificationInventoryEOController.java | 12 ++++ .../project/enums/OperatorTypeEnum.java | 1 + ...rojectCertificationInventoryEOService.java | 7 +++ ...ctCertificationInventoryEOServiceImpl.java | 60 ++++++++++++++++--- 4 files changed, 72 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java index da2ac70f0..92f524779 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java @@ -311,4 +311,16 @@ public class ProjectCertificationInventoryEOController extends JeroController updateStatusBatch(@RequestBody JSONObject json) { return this.projectCertificationInventoryEOService.updateStatusBatch(json); } + + /** + * 添加配置 等同于 复制 + * @param json + * @return + */ + @AutoLog(value = "项目库-认证清单表-添加配置") + @ApiOperation(value="项目库-认证清单表-添加配置", notes="项目库-认证清单表-添加配置") + @PostMapping(value = "/addConfigByIds") + public Result addConfigByIds(@RequestBody JSONObject json) { + return this.projectCertificationInventoryEOService.addConfigByIds(json); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index bb067bfc8..537d5f671 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -69,6 +69,7 @@ public enum OperatorTypeEnum { CERTIFICATION_INVENTORY_REVIEW_RETURNED("认证清单-认证工程师审核退回","certificationInventoryReviewReturned"), CERTIFICATION_INVENTORY_CALL_ADD("认证清单-调取添加","certificationInventoryCallAdd"), CERTIFICATION_INVENTORY_IMPORT_ADD("认证清单-导入添加","certificationInventoryImportAdd"), + CERTIFICATION_INVENTORY_ADD_CONFIG("认证清单-添加配置","certificationInventoryAddConfig"), /** * 项目库-法规清单 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index 870f8fdde..65d04bd5a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -241,4 +241,11 @@ public interface IProjectCertificationInventoryEOService extends IService updateStatusBatch(JSONObject json); + + /** + * 添加配置 + * @param json + * @return + */ + Result addConfigByIds(JSONObject json); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 40bdff7db..dd1740697 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -523,11 +523,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result,projectLibraryId); + // List saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList,cut,result,projectLibraryId); - if(CollectionUtils.isNotEmpty(saveDataList)){ - this.saveBatch(saveDataList); - this.saveProjectCertificationInventoryLog(saveDataList,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue()); + if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOList)){ + this.saveBatch(projectCertificationInventoryEOList); + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue()); } }catch (Exception ex){ ex.printStackTrace(); @@ -2967,17 +2967,17 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result, projectLibraryId); +// List saveDataList = this.dataUniqueCheck(projectCertificationInventoryEOList, cut, result, projectLibraryId); - this.saveBatch(saveDataList); + this.saveBatch(projectCertificationInventoryEOList); // 设置历史log（修改历史） - this.saveProjectCertificationInventoryLog(saveDataList,OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL_ADD.getValue()); + this.saveProjectCertificationInventoryLog(projectCertificationInventoryEOList,OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL_ADD.getValue()); Date now = new Date(); //设置权限 先删后加 List adds = new ArrayList<>(); - for (ProjectCertificationInventoryEO pci: saveDataList) { + for (ProjectCertificationInventoryEO pci: projectCertificationInventoryEOList) { if (ObjectUtils.isNotEmpty(pci.getSdt())) { setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue()); } @@ -4528,6 +4528,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl addConfigByIds(JSONObject json) { + String ids = json.getString("ids"); + String configItem = json.getString("configItem"); + if (StringUtils.isEmpty(ids)) { + throw new JeroBootException("至少选择一条数据进行添加配置操作！"); + } + List addConfigPciEoList = new ArrayList<>(); + + QueryWrapper pciQueryWrap = new QueryWrapper<>(); + pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,Arrays.asList(ids.split(","))); + List pciEoList = this.list(pciQueryWrap); + + pciEoList.forEach(pciEo -> { + ProjectCertificationInventoryEO addConfigPciEo = new ProjectCertificationInventoryEO(); + BeanUtils.copyProperties(pciEo,addConfigPciEo); + addConfigPciEo.setId(UUID.randomUUID().toString().replace("-","")); + addConfigPciEo.setConfigItem(configItem); + addConfigPciEoList.add(addConfigPciEo); + }); + + if(CollectionUtils.isNotEmpty(addConfigPciEoList)){ + this.saveBatch(addConfigPciEoList); + + // 设置历史log（修改历史） + this.saveProjectCertificationInventoryLog(addConfigPciEoList,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD_CONFIG.getValue()); + } + + return Result.OK("添加配置成功！"); + } }