ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 重汽年度制修订流程变更

Browse Source
This commit is contained in:
mzaxd
2024-08-07 11:05:26 +08:00
parent 845d8bf7af
commit 79f4752b8a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ProcessESAnnualInitEndListener.java
+1 -4
View File
@@ -9,7 +9,6 @@ import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPRevisionTy
import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision; import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision;
import com.jero.modules.activiti.process.esRevision.entity.vo.ESRevisionDataVO; import com.jero.modules.activiti.process.esRevision.entity.vo.ESRevisionDataVO;
import com.jero.modules.activiti.process.esRevision.service.EsRevisionService; import com.jero.modules.activiti.process.esRevision.service.EsRevisionService;
import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
@@ -43,9 +42,6 @@ public class ProcessESAnnualInitEndListener implements ExecutionListener {
@Resource @Resource
private EnterpriseStandardUtil esUtil; private EnterpriseStandardUtil esUtil;
@Resource
private ProcessAllService processAllService;
/** /**
* 流程结束之后需要把数据存入企标计划数据库 * 流程结束之后需要把数据存入企标计划数据库
* *
@@ -59,6 +55,7 @@ public class ProcessESAnnualInitEndListener implements ExecutionListener {
// 根据流程实例Id找到所有流程业务数据 // 根据流程实例Id找到所有流程业务数据
LambdaQueryWrapper<ProcessEsAnnualInit> esAnnualInitWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessEsAnnualInit> esAnnualInitWrapper = new LambdaQueryWrapper<>();
esAnnualInitWrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId); esAnnualInitWrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId);
esAnnualInitWrapper.eq(ProcessEsAnnualInit::getExecutionId, delegateExecution.getId());
List<ProcessEsAnnualInit> annualInits = annualInitService.list(esAnnualInitWrapper); List<ProcessEsAnnualInit> annualInits = annualInitService.list(esAnnualInitWrapper);
if (annualInits == null || annualInits.isEmpty()) { if (annualInits == null || annualInits.isEmpty()) {
log.info("年度制修订标准化发起流程结束 监听执行器未找到流程业务数据"); log.info("年度制修订标准化发起流程结束 监听执行器未找到流程业务数据");
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+3
View File
@@ -271,6 +271,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
break; break;
case STANDARD_ENGINEER_COLLECT: case STANDARD_ENGINEER_COLLECT:
// do nothing now // do nothing now
wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
break; break;
} }
wrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId); wrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId);
@@ -446,6 +447,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
throw new JeroBootException("提交的新企标编号中有重复企标编号,请检查！"); throw new JeroBootException("提交的新企标编号中有重复企标编号,请检查！");
} }
} }
List<String> idList = dataList.stream().map(ProcessEsAnnualInit::getId).collect(Collectors.toList());
wrapper.in(ProcessEsAnnualInit::getId, idList);
remove(wrapper); remove(wrapper);
saveBatch(dataList); saveBatch(dataList);
break; break;