This commit is contained in:
zfh 2025-02-20 20:55:07 +08:00
parent acf469307d
commit de852b063d
5 changed files with 52 additions and 2 deletions

View File

@ -29,7 +29,7 @@ public class SysWorkflowRecordHistory {
/**
* 下个流程节点id
*/
private String nextNodeId;
private Integer nextNodeId;
/**
* 审批结果0拒绝 1通过

View File

@ -0,0 +1,10 @@
package com.bonus.material.work.mapper;
import com.bonus.material.work.domain.SysWorkflowRecord;
import com.bonus.material.work.domain.SysWorkflowRecordHistory;
public interface SysWorkflowRecordHistoryMapper {
int addSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory);
}

View File

@ -1,9 +1,12 @@
package com.bonus.material.work.service.impl;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.work.domain.SysWorkflowRecord;
import com.bonus.material.work.domain.SysWorkflowRecordHistory;
import com.bonus.material.work.domain.SysWorkflowType;
import com.bonus.material.work.mapper.SysWorkflowRecordHistoryMapper;
import com.bonus.material.work.mapper.SysWorkflowRecordMapper;
import com.bonus.material.work.mapper.SysWorkflowTypeMapper;
import com.bonus.material.work.service.SysWorkflowRecordService;
@ -22,6 +25,9 @@ public class SysWorkflowRecordServiceImpl implements SysWorkflowRecordService {
@Resource
private SysWorkflowTypeMapper sysWorkflowTypeMapper;
@Resource
private SysWorkflowRecordHistoryMapper sysWorkflowRecordHistoryMapper;
@Override
@Transactional
public int addSysWorkflowRecord(int taskId,String taskCode,int taskType) {
@ -44,6 +50,12 @@ public class SysWorkflowRecordServiceImpl implements SysWorkflowRecordService {
//创建审核记录
SysWorkflowRecordHistory sysWorkflowRecordHistory = new SysWorkflowRecordHistory();
sysWorkflowRecordHistory.setRecordId(sysWorkflowRecord.getId());
sysWorkflowRecordHistory.setNodeId(1);
sysWorkflowRecordHistory.setNextNodeId(2);
sysWorkflowRecordHistory.setIsAccept(1);
sysWorkflowRecordHistory.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
sysWorkflowRecordHistory.setCreateTime(DateUtils.getNowDate());
sysWorkflowRecordHistoryMapper.addSysWorkflowRecordHistory(sysWorkflowRecordHistory);
return count;
}
}

View File

@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP_CONCAT(sec.config_value SEPARATOR ',') AS configValues
from sys_workflow_node swn
left join sys_workflow_config sec on swn.id= sec.node_id
where swn.type_id='1'
where swn.type_id=#{typeId}
<if test="nodeName != null "> and type_name like concat('%', #{typeName}, '%')</if>
<if test="nodeSignType != null "> and node_sign_type = #{nodeSignType}</if>
GROUP BY swn.id

View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.material.work.mapper.SysWorkflowRecordHistoryMapper">
<insert id="addSysWorkflowRecordHistory" useGeneratedKeys="true" keyProperty="id">
insert into sys_workflow_record_history
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="recordId != null">record_id,</if>
<if test="nodeId != null">node_id,</if>
<if test="nextNodeId != null">next_node_id,</if>
<if test="isAccept != null">is_accept,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="recordId != null">#{recordId},</if>
<if test="nodeId != null">#{nodeId},</if>
<if test="nextNodeId != null">#{nextNodeId},</if>
<if test="isAccept != null">#{isAccept},</if>
<if test="createBy != null">#{createBy},</if>
<if test="remark != null">remark,</if>
</trim>
</insert>
</mapper>