Merge remote-tracking branch 'origin/master'

This commit is contained in:
hongchao 2025-03-19 09:49:49 +08:00
commit de2799ac40
1 changed files with 31 additions and 1 deletions

View File

@ -1,5 +1,6 @@
package com.bonus.material.work.service.impl;
import com.bonus.common.biz.enums.LeaseTaskStatusEnum;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.security.utils.SecurityUtils;
@ -77,6 +78,10 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
sysWorkflowRecord.setTaskId(sysWorkflowRecordHistory.getTaskId());
sysWorkflowRecord.setWorkflowStatus(1);
sysWorkflowRecordMapper.updateSysWorkflowRecord(sysWorkflowRecord);
TmTask tmTask = new TmTask();
tmTask.setTaskId(sysWorkflowRecordHistory.getTaskId().longValue());
tmTask.setTaskStatus(LeaseTaskStatusEnum.LEASE_AUDIT_ING.getStatus());
tmTaskMapper.updateTmTask(tmTask);
System.out.println("-------------节点更新任务信息-------------");
fly = i;
}else {
@ -120,7 +125,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
//修改业务状态
TmTask tmTask = new TmTask();
tmTask.setTaskId(sysWorkflowRecordHistory.getTaskId().longValue());
tmTask.setTaskStatus(1);
tmTask.setTaskStatus(LeaseTaskStatusEnum.LEASE_TASK_TO_PUBLISHED.getStatus());
tmTaskMapper.updateTmTask(tmTask);
System.out.println("-------------执行了最后业务办理领料-------------");
break;
@ -146,6 +151,31 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
sysWorkflowRecord.setTaskId(sysWorkflowRecordHistory.getTaskId());
sysWorkflowRecord.setWorkflowStatus(3);
sysWorkflowRecordMapper.updateSysWorkflowRecord(sysWorkflowRecord);
SysWorkflowAuditDto sysWorkflowRecodeInfo = sysWorkflowRecordMapper.getSysWorkflowRecodeByTaskId(sysWorkflowRecordHistory.getTaskId());
// 根据任务类型修改业务状态
switch (sysWorkflowRecodeInfo.getTaskType()) {
// 领用任务:19
case 19:
//修改业务状态
TmTask tmTask = new TmTask();
tmTask.setTaskId(sysWorkflowRecordHistory.getTaskId().longValue());
tmTask.setTaskStatus(LeaseTaskStatusEnum.LEASE_TASK_TO_AUDIT.getStatus());
tmTaskMapper.updateTmTask(tmTask);
System.out.println("-------------执行了最后业务办理领料-------------");
break;
// 费用减免:13
case 13:
sltAgreementReduceService.audit(sysWorkflowRecodeInfo);
System.out.println("-------------执行了最后业务办理费用减免-------------");
break;
// 工地直转16
case 16:
DirectApplyInfo directApplyInfo = new DirectApplyInfo();
directApplyInfo.setId(sysWorkflowRecordHistory.getId());
directApplyInfo.setStatus("2");
directAuditMapper.updateDirectAudit(directApplyInfo);
break;
}
}
return 0;
}