From bb0caa01a86614de978413f6eb6e24abe8fee484 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 7 Sep 2022 11:57:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=85=E5=8D=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=93=8D=E4=BD=9C=E9=80=BB=E8=BE=91-studio=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E5=8F=91=E8=B5=B7=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E9=80=9A=E8=BF=87=E7=9A=84=E6=B3=95=E8=A7=84?= =?UTF-8?q?/=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E5=8A=9E=E7=90=86=E4=BB=BB=E5=8A=A1=E3=80=82?= =?UTF-8?q?=E4=B9=9F=E4=B8=8D=E6=8E=A5=E5=8F=97=E6=B6=88=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 52 ++++++++++++++----- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index e9fb0a37d..a2e7b9a03 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -216,6 +216,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl removeWrapper = new QueryWrapper<>(); - removeWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,id); - this.conditionAssessmentEOService.remove(removeWrapper); + //删除该条法规清单数据的 项目当前状态数据 + QueryWrapper conditionAssessmentRemoveWrapper = new QueryWrapper<>(); + conditionAssessmentRemoveWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,id); + this.conditionAssessmentEOService.remove(conditionAssessmentRemoveWrapper); + //删除该条法规清单数据的拒绝原因。 + QueryWrapper rejectCauseRemoveWrapper = new QueryWrapper<>(); + rejectCauseRemoveWrapper.lambda().eq(ProjectLawsInventoryRejectCauseEO::getProjectLawsInventoryId,id); + this.projectLawsInventoryRejectCauseEOService.remove(rejectCauseRemoveWrapper); } /** @@ -635,9 +642,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl removeWrapper = new QueryWrapper<>(); - removeWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,ids); - this.conditionAssessmentEOService.remove(removeWrapper); + //删除该条法规清单数据的 项目当前状态数据 + QueryWrapper conditionAssessmentRemoveWrapper = new QueryWrapper<>(); + conditionAssessmentRemoveWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,ids); + this.conditionAssessmentEOService.remove(conditionAssessmentRemoveWrapper); + + //删除该条法规清单数据的拒绝原因。 + QueryWrapper rejectCauseRemoveWrapper = new QueryWrapper<>(); + rejectCauseRemoveWrapper.lambda().in(ProjectLawsInventoryRejectCauseEO::getProjectLawsInventoryId,ids); + this.projectLawsInventoryRejectCauseEOService.remove(rejectCauseRemoveWrapper); } /** @@ -1385,14 +1398,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus,null); - updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null); updateWrapper.eq(ProjectLawsInventoryEO::getId,projectLawsInventoryEO.getId()); - super.update(projectLawsInventoryEO, updateWrapper); - - userIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); - userIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); + //认证工程师标识 如果认证工程师提交状态为空， 或认证工程师拒绝过，给认证工程师任务，让他处理 + boolean homologationEngineerFlag = ( + StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus()) + || StringUtils.equals(projectLawsInventoryEO.getHomologationEngineerSubmitStatus(),"1") + ); + //法规工程师标识 如果法规工程师提交状态为空， 或法规工程师拒绝过，给法规工程师任务，让他处理 + boolean regulationOwnerFlag = ( + StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus()) + || StringUtils.equals(projectLawsInventoryEO.getRegulationOwnerSubmitStatus(),"1") + ); + if(homologationEngineerFlag){ + updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null); + userIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); + } + if(regulationOwnerFlag){ + updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus,null); + userIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); + } + if(homologationEngineerFlag || regulationOwnerFlag){ + super.update(projectLawsInventoryEO, updateWrapper); + } } }