bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mashuai 2025-02-21 03:48:09 +08:00
parent 20159734dd fb47cac1c4
commit 5a24c1baf0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java
View File

@ -66,6 +66,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
sysWorkflowRecord.setTaskId(sysWorkflowRecordHistory.getTaskId());
sysWorkflowRecord.setWorkflowStatus(1);
sysWorkflowRecordMapper.updateSysWorkflowRecord(sysWorkflowRecord);
System.out.println("-------------节点更新任务信息-------------");
fly = i;
}else {
throw new ServiceException("当前节点不在审核中");
@ -78,6 +79,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
sysWorkflowRecord.setTaskId(sysWorkflowRecordHistory.getTaskId());
sysWorkflowRecord.setWorkflowStatus(2);
sysWorkflowRecordMapper.updateSysWorkflowRecord(sysWorkflowRecord);
System.out.println("-------------节点更新任务信息为完成-------------");
SysWorkflowAuditDto sysWorkflowRecodeInfo = sysWorkflowRecordMapper.getSysWorkflowRecodeByTaskId(sysWorkflowRecordHistory.getTaskId());
if (sysWorkflowRecodeInfo == null) {
@ -93,10 +95,12 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
tmTask.setTaskId(sysWorkflowRecordHistory.getTaskId().longValue());
tmTask.setTaskStatus(1);
tmTaskMapper.updateTmTask(tmTask);
System.out.println("-------------执行了最后业务办理领料-------------");
break;
// 费用减免:13
case 13:
sltAgreementReduceService.audit(sysWorkflowRecodeInfo);
System.out.println("-------------执行了最后业务办理费用减免-------------");
break;
// 工地直转16
case 16:

4
bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordMapper.xml
View File

@ -24,7 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert>
<update id="updateSysWorkflowRecord">
update sys_workflow_record set workflow_status = #{workflowStatus} where task_id = #{taskId}
<if test="taskType != null"> and task_type = #{taskType}</if>
<if test="taskType != null">
and task_type = #{taskType}
</if>
</update>
<select id="getSysWorkflowRecodeByTaskId" resultType="com.bonus.material.work.domain.dto.SysWorkflowAuditDto">