From 0093e118cd7b1367c9b4a1e2d966029d48ecfab3 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 20 Mar 2023 13:40:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectLawsInventoryEO.java | 8 +++ .../enums/ComplianceFlowStatusEnum.java | 4 ++ .../IProjectLawsInventoryEOService.java | 10 +++ .../ProjectLawsInventoryEOServiceImpl.java | 21 ++++++ .../DesignComplianceFlowNodeKeyEnum.java | 65 +++++++++++++++++++ .../VerifyComplianceFlowNodeKeyEnum.java | 65 +++++++++++++++++++ .../impl/ProcessInfoEOServiceImpl.java | 36 ++++++++++ .../modules/todoCenter/vo/ProcessInfoVO.java | 5 ++ 8 files changed, 214 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index def122c18..267fac61b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -495,4 +495,12 @@ public class ProjectLawsInventoryEO implements Serializable { private String verifyFlowStatus; @TableField(exist = false) private String verifyFlowStatusName; + + /**验证符合性确认-流程实例id*/ + @TableField(exist = false) + private String verifyPId; + + /**设计符合性确认-流程实例id*/ + @TableField(exist = false) + private String designPId; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java index 25b712ff2..b47461102 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java @@ -12,6 +12,10 @@ public enum ComplianceFlowStatusEnum { TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"), RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), + CONFORMITY("符合","Compliance","Compliance"), + INCONFORMITY("不符合","Non-Compliance","Non-Compliance"), + TO_TRACK("待追踪","To be tracked","To be tracked"), + UNINVOLVED("不涉及","NA","NA") ; 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 859ac9661..88bb14dae 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 @@ -9,6 +9,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.vo.ProjectTaskUrgVo; +import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysRole; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; @@ -182,4 +183,13 @@ public interface IProjectLawsInventoryEOService extends IService regulationOwnerReturned(JSONObject json); + + /** + * 根据id获取交付物类型展示名称 + * @param projectLawsInventoryId + * @param cut + * @param flowType + * @return + */ + String getDeliverableTypeNameById(String projectLawsInventoryId, String cut, String flowType,List projectLawsInventoryEOList,List categoryList); } 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 f2410492e..bd8164590 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 @@ -5727,6 +5727,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryQueryWrapper = new QueryWrapper<>(); @@ -10059,5 +10061,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList,List categoryList) { + String result = ""; + + for (ProjectLawsInventoryEO lawsInventory : projectLawsInventoryEOList) { + if(StringUtils.equals(projectLawsInventoryId,lawsInventory.getId())){ + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + List designDeliverableTypeList = Arrays.asList(lawsInventory.getDesignDeliverableType().split(",")); + result = this.getTreeName(cut, categoryList, designDeliverableTypeList); + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + lawsInventory.getVerifyDeliverableType(); + List verifyDeliverableTypeList = Arrays.asList(lawsInventory.getVerifyDeliverableType().split(",")); + result = this.getTreeName(cut, categoryList, verifyDeliverableTypeList); + } + } + } + return result; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java new file mode 100644 index 000000000..9c097b85a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java @@ -0,0 +1,65 @@ +package com.jero.modules.todoCenter.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 待办中心-设计符合性流程节点key枚举类 + */ +public enum DesignComplianceFlowNodeKeyEnum { + fqlc("发起流程","Initiate the process","fqlc"), + zrrqr("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 + dezrrqr("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 + zrrtjjfw("设计符合性确认","Design compliance confirmation","zrrtjjfw"),// "责任人提交交付物" + dezrrtjjfw("设计符合性确认","Design compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 + fggcssh("设计符合性审查","Design compliance review","fggcssh"), // 法规工程师审核 + ; + + String cnName; + String enName; + String value; + + private DesignComplianceFlowNodeKeyEnum(String cnName, String enName, String value) { + this.cnName = cnName; + this.enName = enName; + this.value = value; + } + + public String getCnName() { + return cnName; + } + + public void setCnName(String cnName) { + this.cnName = cnName; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + DesignComplianceFlowNodeKeyEnum[] values = values(); + for (DesignComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) { + if (todoCenterStatusEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return todoCenterStatusEnum.cnName; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + return todoCenterStatusEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java new file mode 100644 index 000000000..cf0f3d4b1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java @@ -0,0 +1,65 @@ +package com.jero.modules.todoCenter.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang3.StringUtils; + +/** + * 待办中心-验证符合性流程节点key枚举类 + */ +public enum VerifyComplianceFlowNodeKeyEnum { + fqlc("发起流程","Initiate the process","fqlc"), + zrrqr("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 + dezrrqr("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 + zrrtjjfw("验证符合性确认","Verify compliance confirmation","zrrtjjfw"),// "责任人提交交付物" + dezrrtjjfw("验证符合性确认","Verify compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 + fggcssh("验证符合性审查","Verify compliance review","fggcssh"), // 法规工程师审核 + ; + + String cnName; + String enName; + String value; + + private VerifyComplianceFlowNodeKeyEnum(String cnName, String enName, String value) { + this.cnName = cnName; + this.enName = enName; + this.value = value; + } + + public String getCnName() { + return cnName; + } + + public void setCnName(String cnName) { + this.cnName = cnName; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + VerifyComplianceFlowNodeKeyEnum[] values = values(); + for (VerifyComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) { + if (todoCenterStatusEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return todoCenterStatusEnum.cnName; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + return todoCenterStatusEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index 6549e3e92..6f56545ad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -24,13 +24,17 @@ import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; import com.jero.modules.project.service.IProjectTaskInventoryEOService; +import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; +import com.jero.modules.todoCenter.enums.DesignComplianceFlowNodeKeyEnum; import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; +import com.jero.modules.todoCenter.enums.VerifyComplianceFlowNodeKeyEnum; import com.jero.modules.todoCenter.mapper.ProcessInfoEOMapper; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; @@ -86,6 +90,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl createByUserList = this.sysUserService.querySysUserListByIdList(createByUserIdList); LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List projectLawsInventoryIdList = datas.stream().filter(data -> { + boolean flag = false; + if (StringUtils.isNotEmpty(data.getProjectLawsInventoryId())) { + flag = true; + } + return flag; + }).map(ProcessInfoVO::getProjectLawsInventoryId).collect(Collectors.toList()); + + List projectLawsInventoryEOList = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){ + QueryWrapper lawsInventoryEOQueryWrapper = new QueryWrapper<>(); + lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList); + projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrapper); + } + List categoryList = sysCategoryService.list(); + for (ProcessInfoVO data : datas) { + // 处理展示的交付物类型信息 + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + String projectLawsInventoryId = data.getProjectLawsInventoryId(); + String deliverableTypeName = this.projectLawsInventoryEOService.getDeliverableTypeNameById(projectLawsInventoryId,cut,data.getFlowType(),projectLawsInventoryEOList,categoryList); + data.setDeliverableTypeName(deliverableTypeName); + } + } datas.forEach(data -> { // 设置发起人的名称 if(CollectionUtils.isNotEmpty(createByUserList) && StringUtils.isNotEmpty(data.getCreateBy())){ @@ -620,6 +649,13 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl Date: Mon, 20 Mar 2023 14:06:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listEditModel.vue | 66 +++----------- .../components/listOfRegulations.vue | 88 ++++++++++++------- 2 files changed, 68 insertions(+), 86 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 8b410da1c..29b533712 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -31,7 +31,6 @@ @@ -46,7 +45,6 @@ @@ -60,7 +58,6 @@ @@ -158,8 +155,6 @@ @@ -169,14 +164,12 @@
- * + * {{$t('certificationLevel')}}
@@ -202,7 +195,7 @@
- +
* @@ -211,9 +204,9 @@ - + @@ -255,7 +248,7 @@
- * + * {{$t('engineeringInterfacePerson')}}
@@ -263,7 +256,6 @@ class="box-input" allowClear :getPopupContainer="triggerNode=> triggerNode.parentNode" - :disabled="formInline.roleCodeIndex == 0 ? false : true" v-model="formInline.engineeringInterfacePerson"> -
+
 {{$t('confirmationOfDesignConformity')}}
- +
@@ -424,11 +408,7 @@ - +
@@ -472,11 +452,7 @@
- +
@@ -657,18 +633,10 @@ -
+
 {{$t('verificationAndConformityconfirmation')}}
- +
@@ -753,11 +721,7 @@ - +
@@ -802,11 +766,7 @@
- +
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index cc980b94b..759991c7c 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -264,11 +264,7 @@ > {{ $t('edit') }} @@ -459,6 +455,7 @@ {{ $t('dataLoading') }} + {{ $t('Submitting') }} @@ -1179,7 +1176,10 @@ selectedRowKeysList: [], rowKeysWarningList: [], rolecode: false, - dataWarningList: [] + dataWarningList: [], + completeTaskList: [], + requestsNum: 0, + JTextLoading: false } }, @@ -2082,7 +2082,7 @@ }) }, - startProcess(value,type) { + startProcess(value, type,index) { let query = { type: type, projectLawsInvnetoryList: value, @@ -2092,11 +2092,20 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - // this.visible = false - // this.selectedRowKeys = [] - // this.$message.success(this.$t('OperationSuccessful')) - // this.confirmLoading = false - this.completeTask(value, res.result) + this.completeTaskList.push(this.completeTask(value, res.result,index)) + Promise.all(this.completeTaskList).then((res) => { + if (this.requestsNum == res.length) { + this.visible = false + this.selectedRowKeys = [] + this.$message.success(this.$t('OperationSuccessful')) + this.confirmLoading = false + this.JTextLoading = false + this.getList() + } + }).catch((error) => { + this.JTextLoading = false + this.$message.warning(error.message) + }) } else { this.$message.warning(this.$t('operationFailed')) } @@ -2119,14 +2128,9 @@ } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { - // this.visible = false - // this.selectedRowKeys = [] - // this.$message.success(this.$t('OperationSuccessful')) - // this.confirmLoading = false - // this.getList() resolve(res) } else { - this.$message.warning(this.$t('operationFailed')) + reject(res) } }) }) @@ -2180,6 +2184,7 @@ let designList = [] let verifyList = [] let detailedWarningList = [] + this.completeTaskList = [] this.detailedWarningList = this.dataWarningList || [] let _this = this _this.$destroyAll() @@ -2225,15 +2230,21 @@ }) return } - this.$confirm({ - content: _this.$t('confirmLaunchTask'), - onOk() { - _this.submitAdmin(dataList) - } - }) + if (num == 1) { + this.$confirm({ + content: _this.$t('confirmLaunchTask'), + onOk() { + _this.submitAdmin(dataList) + } + }) + } else { + _this.submitAdmin(dataList) + } }, submitAdmin(dataList) { let _this = this + this.requestsNum = 0 + this.JTextLoading = true for (let i = 0; i < dataList.length; i++) { if (dataList[i].designDeliverableType) { if (!dataList[i].designDutyId) { @@ -2255,18 +2266,29 @@ < div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForVerifyingEmpty') } < /div>) } } - if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) { - _this.startProcess(dataList[i], 2) - Promise.all(_this.completeTask()).then((res) => { - console.log(res) - }).catch(error => { - console.log('error', error) - }) + if (dataList[i].designFlowStatus == 'List to be checked') { + if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) { + this.requestsNum++ + _this.startProcess(dataList[i], 2,this.requestsNum) + } + } else { + _this.detailedWarningList.push( + < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>) } - if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) { - _this.startProcess(dataList[i], 2) + if (dataList[i].verifyFlowStatus == 'List to be checked') { + if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) { + this.requestsNum++ + _this.startProcess(dataList[i], 2,this.requestsNum) + } + } else { + _this.detailedWarningList.push( + < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>) } } + if (this.requestsNum == 0) { + _this.promptInformation(_this.detailedWarningList) + this.JTextLoading = false + } }, handleOkComment() { this.$refs.ruleFormComment.validate(valid => { From b3bc2cf59093c70a665370baabfe5f5b864bd11e Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 20 Mar 2023 14:24:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-studio?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=B5=81=E7=A8=8B=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 34 ++++++++++++++----- .../service/IProcessHistoryEOService.java | 2 ++ .../impl/ProcessHistoryEOServiceImpl.java | 10 ++++++ 3 files changed, 37 insertions(+), 9 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 bd8164590..82e60c2e5 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 @@ -5731,7 +5731,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryQueryWrapper = new QueryWrapper<>(); + 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(",")); + + /*QueryWrapper taskInventoryQueryWrapper = new QueryWrapper<>(); taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList); List projectTaskInventoryList = this.projectTaskInventoryEOService.getBaseMapper().selectList(taskInventoryQueryWrapper); @@ -5769,13 +5782,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { - ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); - String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); - projectTaskInventoryEO.setId(projectTaskInventoryId); - projectTaskInventoryEO.setProjectLawsInventoryId(id); - projectTaskInventoryEOList.add(projectTaskInventoryEO); - });*/ +// idList.forEach(id -> { +// ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); +// String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); +// projectTaskInventoryEO.setId(projectTaskInventoryId); +// projectTaskInventoryEO.setProjectLawsInventoryId(id); +// projectTaskInventoryEOList.add(projectTaskInventoryEO); +// }); //项目任务清单数据初始化。 this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList); this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); @@ -5809,7 +5822,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deleteConditionAssessmentWrapper = new QueryWrapper<>(); deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList); - this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper); + this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);*/ JSONObject params = new JSONObject(); params.put("projectLawsInventoryIds",projectLawsInventoryIds); @@ -5820,6 +5833,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { * @return */ Result processCall(JSONObject jsonObject); + + void deleteBiActiProcInstIdList(List actiProcInstIdList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java index 900ed9ee9..1ffbcbec0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java @@ -182,4 +182,14 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl().success("调用成功！"); } + + @Override + public void deleteBiActiProcInstIdList(List actiProcInstIdList) { + if(CollectionUtils.isNotEmpty(actiProcInstIdList)){ + QueryWrapper removeWrap = new QueryWrapper<>(); + removeWrap.lambda().in(ProcessHistoryEO::getActiProcInstId,actiProcInstIdList); + this.remove(removeWrap); + + } + } }