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

fix(企标稽查整改): 81096

Browse Source
This commit is contained in:
yjz
2024-01-23 11:25:41 +08:00
parent 3d99d03a06
commit 88722aa321
1 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java
+13 -4
View File
@@ -263,9 +263,16 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date parse = dateFormat.parse(dateFormat.format(date)); Date parse = dateFormat.parse(dateFormat.format(date));
// 是否申请延期 // 是否申请延期
if (EsInspectRectifyCommon.OPERATION_TYPE_2.equals(processEsInspectReportVO.getOperationType()) if (EsInspectRectifyCommon.OPERATION_TYPE_2.equals(processEsInspectReportVO.getOperationType())){
&& (processEsInspectReportVO.getApplyDelayDate().before(parse) // 更新整改计划完成日期
|| processEsInspectReportVO.getApplyDelayDate().equals(parse))){ enterpriseStandardInspectRectifyPlanService.update(
new LambdaUpdateWrapper<EnterpriseStandardInspectRectifyPlan>()
.eq(EnterpriseStandardInspectRectifyPlan::getId, processEsInspectReportVO.getInspectRectifyPlanId())
.set(EnterpriseStandardInspectRectifyPlan::getPlanCompleteDate, processEsInspectReportVO.getApplyDelayDate()));
// 申请延期日期 <= 当前日期 立即生成新流程
if (processEsInspectReportVO.getApplyDelayDate().before(parse)
|| processEsInspectReportVO.getApplyDelayDate().equals(parse)){
// 生成新整改流程 // 生成新整改流程
EsInspectRectifyFlowVO newEsInspectReportFlowVO = new EsInspectRectifyFlowVO(); EsInspectRectifyFlowVO newEsInspectReportFlowVO = new EsInspectRectifyFlowVO();
// 处理流程信息 // 处理流程信息
@@ -275,7 +282,8 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
newEsInspectReportFlowVO.setProcessAll(newProcessAll); newEsInspectReportFlowVO.setProcessAll(newProcessAll);
// 整改计划 // 整改计划
EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan = enterpriseStandardInspectRectifyPlanService.getById(processEsInspectReportVO.getInspectRectifyPlanId()); EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan =
enterpriseStandardInspectRectifyPlanService.getById(processEsInspectReportVO.getInspectRectifyPlanId());
// 处理流程审批信息 // 处理流程审批信息
ProcessApprovalRecord newProcessApprovalRecord = new ProcessApprovalRecord(); ProcessApprovalRecord newProcessApprovalRecord = new ProcessApprovalRecord();
@@ -306,6 +314,7 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
new LambdaUpdateWrapper<ProcessEsInspectRectify>() new LambdaUpdateWrapper<ProcessEsInspectRectify>()
.in(ProcessEsInspectRectify::getId, processEsInspectReportVO.getId()) .in(ProcessEsInspectRectify::getId, processEsInspectReportVO.getId())
.set(ProcessEsInspectRectify::getIsDelayCreate, YesOrNoEnum.YES.getValue())); .set(ProcessEsInspectRectify::getIsDelayCreate, YesOrNoEnum.YES.getValue()));
}
}else { }else {
// 更新整改状态 // 更新整改状态
enterpriseStandardInspectRectifyPlanService.update(new LambdaUpdateWrapper<EnterpriseStandardInspectRectifyPlan>() enterpriseStandardInspectRectifyPlanService.update(new LambdaUpdateWrapper<EnterpriseStandardInspectRectifyPlan>()