From 39f8bf60f59161b6cd0367328da045f1b24af29a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 16 May 2023 10:41:34 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/listOfRegulations.vue | 109 +++++++++++++++++- 3 files changed, 105 insertions(+), 6 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 533f02122..83b73c96f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1834,4 +1834,5 @@ module.exports = { deliveryTime:'Delivery Time', expectedDeliveryTime:'Expected Delivery Time', changeAuthor:'Change Author', + theProcessThatNeedsToBeReset:'The process that needs to be reset', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e9e2d3a19..1b65de92b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1935,4 +1935,5 @@ module.exports = { deliveryTime:'交付时间', expectedDeliveryTime:'预计交付时间', changeAuthor:'更改作者', + theProcessThatNeedsToBeReset:'需要重置的流程', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index a184b8a39..fe17baa7c 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -616,6 +616,43 @@ + +
+ {{$t('NoteConfirmTheChange')}} +
+ + + +
+
+ * + {{ $t('processReset') }} +
+ + + + + {{ item.name }} + + + + +
+ + + + { + this.$refs.ruleFormReset.clearValidate() + }) + // this.changeInterface(selectedRowKeys) + this.visibleReset = true } } else { this.$message.warning(this.$t('selectLeastOne')) } }, - + handleOkReset() { + this.$refs.ruleFormReset.validate(valid => { + if (valid) { + let _this = this + let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + postAction('/project/projectLawsInventoryEO/change', { + ids: idList.join(','), + projectLibraryId: _this.$route.query.id, + operateType: _this.formInlineReset.operateType + }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.pageNo = 1 + _this.getList() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) + }, + handleCancelReset() { + this.visibleReset = false + }, //流程重置接口 changeInterface() { let _this = this @@ -2858,9 +2950,9 @@ } if (dataList[i].designFlowStatus == 'List to be checked' || dataList[i].designFlowStatus == 'Duty Person Rejected') { if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) { - if (dataList[i].designDeliverableType == '1645667531513237506'){ + if (dataList[i].designDeliverableType == '1645667531513237506') { - }else{ + } else { this.requestsNum++ this.startProcessList.push({ dataList: dataList[i], @@ -2876,9 +2968,9 @@ } if (dataList[i].verifyFlowStatus == 'List to be checked' || dataList[i].verifyFlowStatus == 'Duty Person Rejected') { if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) { - if (dataList[i].verifyDeliverableType == '1645667531513237506'){ + if (dataList[i].verifyDeliverableType == '1645667531513237506') { - }else{ + } else { this.requestsNum++ this.startProcessList.push({ dataList: dataList[i], @@ -3457,6 +3549,11 @@ .operator-text-title:last-child { margin-bottom: 0; } + + .noteConfirm { + font-size: 14px; + margin-bottom: 10px; + } \ No newline at end of file From deacae7575c2f33f4ebf1e98f2bfbaedab5bcd48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 18 May 2023 14:22:27 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/toResubmitForm.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/toResubmitForm.vue b/jero-web/src/views/projectManagement/components/toResubmitForm.vue index 15d25240e..09d07ccf4 100644 --- a/jero-web/src/views/projectManagement/components/toResubmitForm.vue +++ b/jero-web/src/views/projectManagement/components/toResubmitForm.vue @@ -57,9 +57,9 @@ {{$t('notInvolved')}} - - {{$t('sendBack')}} - + + + From 2de2213289cd57c38da4698b3c2b0e89058109f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 18 May 2023 14:37:13 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/reviewedByThePersonInCharge.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index ea6dbae30..455c43930 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -27,23 +27,23 @@ {{$t('refuse')}} - + {{$t('adopt')}} - + {{$t('accord')}} - + {{$t('nonConformity')}} - + {{$t('Tracked')}} - + {{$t('notInvolved')}} + query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'fggcssh' || query.TaskKey == 'fggcsbcsh'"> {{$t('sendBack')}} From 9a3f6ef17a4abce76e2201cf6850b45538d9895e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 18 May 2023 14:56:30 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/circulationHistory.vue | 5 +++-- .../components/reviewedByThePersonInCharge.vue | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 3528accfb..86e129011 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -245,7 +245,8 @@ } }) } - if (this.queryProject.TaskKey == 'zrrtjjfw' || this.queryProject.TaskKey == 'dezrrtjjfw') { + if (this.queryProject.TaskKey == 'zrrtjjfw' || this.queryProject.TaskKey == 'dezrrtjjfw' || + this.queryProject.TaskKey == 'zrrbctjxg') { this.regulatoryCertificationTaskPlanList.forEach(val => { if (val.name == this.$t('initiatingProcess')) { val.status = '1' @@ -260,7 +261,7 @@ } }) } - if (this.queryProject.TaskKey == 'fggcssh') { + if (this.queryProject.TaskKey == 'fggcssh' || this.queryProject.TaskKey == 'fggcsbcsh') { if (taskData.operatorResult == 'Adopt') { this.regulatoryCertificationTaskPlanList.forEach(val => { if (val.name == this.$t('initiatingProcess')) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index 455c43930..9a3b17b27 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -97,7 +97,8 @@ + v-if="query.TaskKey == 'dezrrtjjfw' || query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'fggcssh' + || query.TaskKey == 'zrrbctjxg' || query.TaskKey == 'fggcsbcsh'">
From 936cb853f4b61631e2e015a3666abbc59f6ded64 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 18 May 2023 15:21:22 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E4=BB=98?= =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=A8=8B=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 4 ++ .../DesignComplianceFlowNodeKeyEnum.java | 5 ++ .../VerifyComplianceFlowNodeKeyEnum.java | 5 ++ .../mapper/xml/ProcessInfoEOMapper.xml | 2 +- .../impl/ProcessInfoEOServiceImpl.java | 2 + .../ProcessHistoryEOController.java | 13 +++++ .../wkflow/controller/workFlowController.java | 4 +- .../service/IProcessHistoryEOService.java | 7 +++ .../impl/ProcessHistoryEOServiceImpl.java | 50 +++++++++++++++---- 9 files changed, 80 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 02c6ce08e..04a24be20 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 @@ -6740,12 +6740,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl concat(pli.serial_number,' ',bdl.title_en) as standard_info, - pi.flow_type, + (case pi.flow_type when '32' THEN '2' when '34' THEN '4' else pi.flow_type END) as flow_type, pi.create_by, pi.end_time, pi.STATUS, 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 83c0c130e..b2a5c2563 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 @@ -224,6 +224,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl> queryComplianceProcessHistoryList(@RequestParam Map params) { + List list = processHistoryEOService.queryComplianceProcessHistoryList(params); + return Result.OK(list); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index 664b1a115..66c5596d5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -77,8 +77,8 @@ public class workFlowController { jsonObject.put("processDefinitionKey", FlowTypeEnum.FGJSPG.getProcessDefinitionKey()); return this.startLawsTechnologyEvaluationProcess(jsonObject); }else if(StringUtils.equals(type,FlowTypeEnum.XGJFWLC.getValue())){ - jsonObject.put("processDefinitionKey", FlowTypeEnum.XGJFWLC.getProcessDefinitionKey()); - return this.startLawsTechnologyEvaluationProcess(jsonObject); + jsonObject.put("id", FlowTypeEnum.XGJFWLC.getProcessDefinitionKey()); + return this.activiti_define_start(jsonObject); }else{ return null; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java index 347b0e17f..5c9d6adcd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java @@ -70,4 +70,11 @@ public interface IProcessHistoryEOService extends IService { Result processCall(JSONObject jsonObject); void deleteBiActiProcInstIdList(List actiProcInstIdList); + + /** + * 查询符合性流程历史 + * @param params + * @return + */ + List queryComplianceProcessHistoryList(Map params); } 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 f128403b6..9c57fb67f 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 @@ -180,17 +180,17 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl queryComplianceProcessHistoryList(Map params) { + String cut = (String) params.get("cut"); + String projectLawsInventoryId = (String) params.get("projectLawsInventoryId"); + if (StringUtils.isEmpty(projectLawsInventoryId)) { + throw new JeroBootException("法规清单id不能为空！"); + } + String flowType = (String) params.get("flowType"); + List flowTypeList = new ArrayList<>(); + flowTypeList.add(flowType); + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + flowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue()); + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + flowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue()); + } + QueryWrapper piQueryWrap = new QueryWrapper<>(); + piQueryWrap.lambda().eq(ProcessInfoEO::getProjectLawsInventoryId, projectLawsInventoryId); + piQueryWrap.lambda().in(ProcessInfoEO::getFlowType, flowTypeList); + List piInfoList = this.processInfoEOService.list(piQueryWrap); + List actiProcInstIdList = piInfoList.stream().map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList()); + + List processHistoryEOList = null; + if(CollectionUtils.isNotEmpty(actiProcInstIdList)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.orderByAsc("create_time"); + queryWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId, actiProcInstIdList); + processHistoryEOList = this.baseMapper.selectList(queryWrapper); + this.disposeData(processHistoryEOList, cut); + } + return processHistoryEOList; + } } From 34fa44d6401664234dd44762ea505efc81e9b629 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 18 May 2023 15:38:08 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E3=80=81=E5=B7=B2?= =?UTF-8?q?=E5=8A=9E=E3=80=81=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml | 2 +- .../todoCenter/service/impl/ProcessInfoEOServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index b88da8940..cb44f30ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -80,7 +80,7 @@ concat(pli.serial_number,' ',bdl.title_en) as standard_info, - pi.flow_type, + (case pi.flow_type when '32' THEN '2' when '34' THEN '4' else pi.flow_type END) as flow_type, pi.create_by, pi.end_time, pi.status, 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 b2a5c2563..bf4da2fb2 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 @@ -514,6 +514,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl Date: Thu, 18 May 2023 15:40:43 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/circulationHistory.vue | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 86e129011..c06a8c737 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -42,14 +42,14 @@ -