From bfb51b2bfdd2bbd72149666e8cc85b48b69ff31f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 5 Jul 2024 11:32:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activiti/enums/ProcessTypeEnum.java | 1 + .../listener/MyGlobalEventListener.java | 11 ----------- .../activiti/service/ProcessAllService.java | 12 +----------- .../service/ProcessApprovalRecordService.java | 17 ----------------- .../enterprise/util/EnterpriseStandardUtil.java | 12 +++++++----- 5 files changed, 9 insertions(+), 44 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java index 1d44120a..aaf6b4ba 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java @@ -12,6 +12,7 @@ import lombok.Getter; public enum ProcessTypeEnum { DEMO("测试流程", 0, "com.jero.modules.activiti.process.demo.service.ProcessDemoService", "/workCenter/StandardEntryOrChangeProcess", "/workCenter/StandardEntryOrChangeProcess"), STANDARD_INTERPRET("标准解读流程", 2, "com.jero.modules.activiti.process.standardinterpret.service.impl.StandardInterpretFlow", "", ""), + STANDARD_COMPLIANCE_CHECK("法规符合性排查流程", 3, "com.jero.modules.activiti.process.standardComplianceCheck.service.ProcessStandardComplianceCheckService", "/workCenter/StandardComplianceCheckProcess", "/workCenter/StandardComplianceCheckProcess"), ; private final String name; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index cdafb79a..d6c10771 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java @@ -353,17 +353,6 @@ public class MyGlobalEventListener implements ActivitiEventListener { ProcessAll process = processAllService.getOne(new LambdaQueryWrapper() .eq(ProcessAll::getProcessInstanceId, processInstanceId)); ProcessNodeService processNodeService = SpringContextUtil.getBean(ProcessNodeService.class); - // 企标复审流程前两个节点都要视为第一个节点 - if (process.getPrcType() != null && process.getPrcType().equals(ProcessTypeEnum.ES_RECHECK.getValue())) { - List nodeList = processNodeService.list(new LambdaQueryWrapper() - .eq(ProcessNode::getProcessDefinitionId, process.getProcessDefinitionId()) - .eq(ProcessNode::getSort, 2)); - for (ProcessNode node : nodeList) { - if (record.getNodeId().equals(node.getXmlNodeId()) && record.getTaskName().equals(node.getNodeName())) { - return true; - } - } - } ProcessNode node = processNodeService.getOne(new LambdaQueryWrapper() .eq(ProcessNode::getProcessDefinitionId, process.getProcessDefinitionId()) .eq(ProcessNode::getSort, 1)); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index 67cb293c..46275cbb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -74,17 +74,7 @@ public class ProcessAllService extends ServiceImpl @Resource private EnterpriseStandardRecheckPlanService esRecheckService; - private static final List INSPECT_PROCESS = Arrays.asList( - ProcessTypeEnum.FB_ENTRY_CHANGE.getValue(), - ProcessTypeEnum.FB_STANDARD_CONSULTATION.getValue(), - ProcessTypeEnum.FB_STANDARD_PURCHASE.getValue(), - ProcessTypeEnum.ES_INSPECT_PLAN.getValue(), - ProcessTypeEnum.ES_INSPECT.getValue(), - ProcessTypeEnum.ES_INSPECT_DELAY_APPLY.getValue(), - ProcessTypeEnum.ES_INSPECT_REPORT.getValue(), - ProcessTypeEnum.PERMISSION_APPLY_PROCESS.getValue(), - ProcessTypeEnum.STANDARD_DECLARE.getValue(), - ProcessTypeEnum.MEETING_MANAGE.getValue()); + private static final List INSPECT_PROCESS = Arrays.asList(); public ProcessAll getByProcessInstanceId(String processInstanceId){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessAll::getProcessInstanceId,processInstanceId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java index 70114f42..711f48f9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java @@ -1,16 +1,13 @@ package com.jero.modules.activiti.service; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.system.api.ISysBaseAPI; -import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.FinishFlagEnum; -import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.mapper.ProcessApprovalRecordMapper; import com.jero.modules.laws.common.util.CurrentUserUtil; import org.apache.commons.lang3.StringUtils; @@ -32,9 +29,6 @@ public class ProcessApprovalRecordService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessApprovalRecord::getTaskId,taskId); @@ -81,20 +75,9 @@ public class ProcessApprovalRecordService extends ServiceImpl().eq(ProcessAll::getProcessInstanceId, processInstanceId)); - if (Objects.equals(processAll.getPrcType(), ProcessTypeEnum.ES_INIT_CHANGE.getValue())){ - specialProcessInitChangeTaskName(records); - } - } return pageList; } - private void specialProcessInitChangeTaskName(List records) { - } - public ProcessApprovalRecord getMyLastComplete(String processInstanceId, String nodeId, String userId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java index 6a679e54..dc720232 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java @@ -1,6 +1,7 @@ package com.jero.modules.laws.enterprise.util; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; @@ -8,10 +9,8 @@ import com.jero.common.system.vo.DictModel; import com.jero.common.util.MessageUtils; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.enums.ProcessStatusEnum; -import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.laws.common.constant.FieldCommon; -import com.jero.common.api.vo.ResultCommon; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; @@ -19,7 +18,10 @@ import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -297,7 +299,7 @@ public class EnterpriseStandardUtil { /** * 校验企标编号是否不重复 * - * @param StandardNumbers 需要校验的企标编号 + * @param standardNumbers 需要校验的企标编号 * @return 返回重复的企标编号 没有重复则返回空集合 */ public List verifyBatchEsNumber(List standardNumbers) { @@ -329,7 +331,7 @@ public class EnterpriseStandardUtil { // 判断是否和立项流程中重复 // 已经撤回的立项流程不需要判断重复 LambdaQueryWrapper processAllLambdaQueryWrapper = new LambdaQueryWrapper<>(); - processAllLambdaQueryWrapper.eq(ProcessAll::getPrcType, ProcessTypeEnum.ES_INIT_CHANGE.getValue()); +// processAllLambdaQueryWrapper.eq(ProcessAll::getPrcType, ProcessTypeEnum.ES_INIT_CHANGE.getValue()); processAllLambdaQueryWrapper.ne(ProcessAll::getPrcStatus, ProcessStatusEnum.WITHDRAWN.getValue()); List paList = processAllService.list(processAllLambdaQueryWrapper); List processInstanceIdList = new ArrayList<>();