From 031fa7e93d1f296969c54b8b7227bf5490778109 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 11 Apr 2023 14:45:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=81=E7=A7=BB=E7=9A=84=E6=B5=81=E7=A8=8B=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOController.java | 7 +++ .../IProjectLawsInventoryEOService.java | 2 + .../ProjectLawsInventoryEOServiceImpl.java | 60 +++++++++++++++++++ .../components/listOfRegulations.vue | 29 ++++++++- 4 files changed, 97 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index 382b570c0..9662dec4a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -493,4 +493,11 @@ public class ProjectLawsInventoryEOController extends JeroController regulationOwnerReturned(@RequestBody JSONObject json) { return this.projectLawsInventoryEOService.regulationOwnerReturned(json); } + + @AutoLog(value = "流程重置-迁移法规清单流程历史数据专用") + @ApiOperation(value="流程重置-迁移法规清单流程历史数据专用", notes="流程重置-迁移法规清单流程历史数据专用") + @PostMapping(value = "/resetFlowTemp") + public Result resetFlowTemp(@RequestBody JSONObject params) { + return this.projectLawsInventoryEOService.resetFlowTemp(params); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 8422527a0..d963e86bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -242,4 +242,6 @@ public interface IProjectLawsInventoryEOService extends IService projectLawsInventoryEOQueryWrapper); + + Result resetFlowTemp(JSONObject parmas); } 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 632ed8fc0..e4f085591 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 @@ -11687,4 +11687,64 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl resetFlowTemp(JSONObject parmas) { + String ids = parmas.getString("ids"); + String projectLibraryId = parmas.getString("projectLibraryId"); + if(StringUtils.isNotEmpty(ids)){ + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); + queryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + List projectLawsInventoryEOS = this.list(queryWrapper); + + List idList = Arrays.asList(ids.split(",")); + String projectLawsInventoryIds = ids; + String pIds = ""; + + ProjectLawsInventoryEO projectLawsInventoryEO = new ProjectLawsInventoryEO(); + projectLawsInventoryEO.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue()); + projectLawsInventoryEO.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue()); + //清单、任务确认初始化。 + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(ProjectLawsInventoryEO::getId,idList); + updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus,null); + updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null); + updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag,null); + updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag,null); + updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate,null); + updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate,null); + updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus,ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus,ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + super.update(projectLawsInventoryEO, updateWrapper); + + QueryWrapper processInfoQueryWrap = new QueryWrapper<>(); + processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,idList); + List processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap); + List actiProcInstIdList = processInfoEOList.stream().filter(processInfo -> { + boolean flag = false; + if (StringUtils.equals(processInfo.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue()) || StringUtils.equals(processInfo.getFlowType(), FlowTypeEnum.YZFHXSCLC.getValue())) { + flag = true; + } + return flag; + }).map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList()); + + pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(",")); + JSONObject params = new JSONObject(); + params.put("projectLawsInventoryIds",projectLawsInventoryIds); + params.put("pIds",pIds); + //根据流程实例id 、 法规清单id 删除相关流程。 + workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params); + + //清除流程中心对应的数据 + params.put("ids",ids); + this.processInfoEOService.change(params); + + // 删除流程历史数据 + this.processHistoryEOService.deleteBiActiProcInstIdList(actiProcInstIdList); + } + return Result.OK("变更成功！"); + } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 4b120259d..5da4a73a0 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -96,6 +96,11 @@
+ +
+ + 重置流程（数据迁移） +
@@ -2808,7 +2813,29 @@ }, download(item) { downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) - } + }, + profileClick(){ + let _this = this + this.$confirm({ + width: 760, + content: _this.$t('NoteConfirmTheChange'), + onOk() { + let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + postAction('/project/projectLawsInventoryEO/resetFlowTemp', { + ids: idList.join(','), + projectLibraryId: _this.$route.query.id + }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.getList() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) + }, } }