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:
bonus 2025-02-21 01:53:12 +08:00
parent 3e6337b54c e808ba7e47
commit c56038b1b3
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java
View File

@ -111,6 +111,7 @@ public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService {
if (StringUtils.isNotNull(sysWorkflowRecordHistoryNew)){ if (StringUtils.isNotNull(sysWorkflowRecordHistoryNew)){
SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryNew.getIsAccept()); SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryNew.getIsAccept());
SysWorkflowNode.setCreateTime(sysWorkflowRecordHistoryNew.getCreateTime()); SysWorkflowNode.setCreateTime(sysWorkflowRecordHistoryNew.getCreateTime());
SysWorkflowNode.setRemark(sysWorkflowRecordHistoryNew.getRemark());
} }
} }

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

@ -3,6 +3,8 @@ package com.bonus.material.work.service.impl;
import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.task.domain.TmTask;
import com.bonus.material.task.mapper.TmTaskMapper;
import com.bonus.material.work.domain.SysWorkflowNode; import com.bonus.material.work.domain.SysWorkflowNode;
import com.bonus.material.work.domain.SysWorkflowRecord; import com.bonus.material.work.domain.SysWorkflowRecord;
import com.bonus.material.work.domain.SysWorkflowRecordHistory; import com.bonus.material.work.domain.SysWorkflowRecordHistory;
@ -34,6 +36,9 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
@Resource @Resource
private SysWorkflowNodeMapper sysWorkflowNodeMapper; private SysWorkflowNodeMapper sysWorkflowNodeMapper;
@Resource
private TmTaskMapper tmTaskMapper;
@Override @Override
@Transactional @Transactional
@ -66,6 +71,12 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis
sysWorkflowRecord.setTaskId(sysWorkflowRecordHistory.getTaskId()); sysWorkflowRecord.setTaskId(sysWorkflowRecordHistory.getTaskId());
sysWorkflowRecord.setWorkflowStatus(2); sysWorkflowRecord.setWorkflowStatus(2);
sysWorkflowRecordMapper.updateSysWorkflowRecord(sysWorkflowRecord); sysWorkflowRecordMapper.updateSysWorkflowRecord(sysWorkflowRecord);
//修改业务状态
TmTask tmTask = new TmTask();
tmTask.setTaskId(sysWorkflowRecordHistory.getTaskId().longValue());
tmTask.setTaskStatus(1);
tmTaskMapper.updateTmTask(tmTask);
} }
}else { }else {
SysWorkflowRecord sysWorkflowRecord = new SysWorkflowRecord(); SysWorkflowRecord sysWorkflowRecord = new SysWorkflowRecord();

2
bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml
View File

@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
swn.node_sign_type as nodeSignType, swn.node_sign_config as nodeSignConfig,swn.id as nodeId, swn.node_sign_type as nodeSignType, swn.node_sign_config as nodeSignConfig,swn.id as nodeId,
swrh.create_by as createBy,swn.is_enable as isEnable, swrh.create_by as createBy,swn.is_enable as isEnable,
GROUP_CONCAT(DISTINCT sec.config_value SEPARATOR ',') AS configValues, GROUP_CONCAT(DISTINCT sec.config_value SEPARATOR ',') AS configValues,
swrh.remark as remark,swr.id as recordId swr.id as recordId
from sys_workflow_node swn from sys_workflow_node swn
left join sys_workflow_config sec on swn.id= sec.node_id left join sys_workflow_config sec on swn.id= sec.node_id
left join sys_workflow_record swr on swr.workflow_id = swn.type_id left join sys_workflow_record swr on swr.workflow_id = swn.type_id

2
bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml
View File

@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert> </insert>
<select id="seleteSysWorkflowRecordHistory" <select id="seleteSysWorkflowRecordHistory"
resultType="com.bonus.material.work.domain.SysWorkflowRecordHistory"> resultType="com.bonus.material.work.domain.SysWorkflowRecordHistory">
select swrh.is_accept as isAccept,swrh.create_time as createTime select swrh.is_accept as isAccept,swrh.create_time as createTime,swrh.remark as remark
from sys_workflow_record_history swrh from sys_workflow_record_history swrh
where swrh.record_id=#{recordId} and swrh.node_id= #{nodeId} where swrh.record_id=#{recordId} and swrh.node_id= #{nodeId}
</select> </select>