From a2d3122bb448217767d15df28c18e6c238b87ccd Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 5 Sep 2022 18:05:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E3=80=82=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=A6=85=E9=81=9359183=E3=80=82=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93-=E8=AF=A6=E6=83=85=E7=BB=9F=E8=AE=A1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BD=93=E5=89=8D=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=2059223=20-=20=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=EF=BC=8C=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...LawsTechnologyEvaluationEOServiceImpl.java | 3 ++ .../ProblemKnowledgeBaseEOServiceImpl.java | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 40 +++++++++++++++++++ .../impl/ProjectLibraryBaseServiceImpl.java | 4 +- .../ProjectTaskInventoryEOServiceImpl.java | 17 +++++--- .../wkflow/controller/workFlowController.java | 6 +-- 6 files changed, 61 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index f3a16a003..f1fdd8e75 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -446,6 +446,9 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl itemInfoMap = new HashMap<>(); String itemId = UUID.randomUUID().toString().replace("-", ""); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index b7460d4c9..3a7397a15 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -806,7 +806,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl removeWrapper = new QueryWrapper<>(); + removeWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,id); + this.conditionAssessmentEOService.remove(removeWrapper); } /** @@ -627,6 +634,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl removeWrapper = new QueryWrapper<>(); + removeWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,ids); + this.conditionAssessmentEOService.remove(removeWrapper); } /** @@ -2620,6 +2631,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId()); + }); } } @@ -4472,6 +4486,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId()); + }); + //删除该法规的任务明细数据 QueryWrapper deleteTaskInventoryDetailWrapper = new QueryWrapper<>(); deleteTaskInventoryDetailWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,idList); @@ -4834,6 +4853,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { + this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId()); + }); //更新log String serialNumber = dataList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); @@ -7314,4 +7337,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl removeWrapper = new QueryWrapper<>(); + removeWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); + this.conditionAssessmentEOService.remove(removeWrapper); + + ConditionAssessmentEO conditionAssessmentEO = new ConditionAssessmentEO(); + conditionAssessmentEO.setRoleCode(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue()); + conditionAssessmentEO.setProjectLawsInventoryId(projectLawsInventoryId); + conditionAssessmentEO.setConditionAssessment(CurrentProjectStatusEnum.BLUE.getValue()); + this.conditionAssessmentEOService.addOrUpdate(conditionAssessmentEO); + } } 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 9cbae09de..688d9e05b 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 @@ -449,8 +449,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl lawsInventoryEOQueryWrapper = new QueryWrapper<>(); lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,id); - lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue()); - lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue()); + //lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue()); + //lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue()); List projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ List projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index ba96e021c..062a0d5f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -179,8 +179,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl lawsInventoryEOQueryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO,req.getParameterMap()); //QueryWrapper lawsInventoryEOQueryWrapper = new QueryWrapper<>(); lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); - lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue()); - lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue()); + //lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue()); + //lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue()); String dutyTerritoryStr = ""; if (StringUtils.isNotEmpty(projectTaskInventoryEO.getDutyTerritory())) { @@ -224,7 +224,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl projectTaskInventoryDetailEOList = this.projectTaskInventoryDetailEOMapper.selectList(taskDetailQueryWrapper); - if(CollectionUtils.isNotEmpty(projectTaskInventoryEOList) && CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){ + //if(CollectionUtils.isNotEmpty(projectTaskInventoryEOList) && CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){ + if(CollectionUtils.isNotEmpty(projectTaskInventoryEOList)){ projectLawsInventoryEOList.forEach(projectLawsInventory -> { projectTaskInventoryEOList.forEach(projectTaskInventory -> { if(StringUtils.equals(projectLawsInventory.getId(),projectTaskInventory.getProjectLawsInventoryId())){ @@ -575,7 +576,13 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl userRoleList = this.sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, currentUser.getId())); // 查询用户所有角色 if(CollectionUtils.isNotEmpty(userRoleList)){ - List roleIdList = CollectManifestRoleIdEnum.getIdList(); + List roleIdList = new ArrayList<>(); + + String adminRoleId = CollectManifestRoleIdEnum.ADMIN_ID.getId(); + String managerRoleId = CollectManifestRoleIdEnum.MANAGER_ID.getId(); + roleIdList.add(adminRoleId); + roleIdList.add(managerRoleId); + List userRoles = userRoleList.stream().filter(userRole -> { boolean flag = false; for (String roleId : roleIdList) { @@ -803,7 +810,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl