diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowRecordHistory.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowRecordHistory.java
index a6bb7525..b56496d1 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowRecordHistory.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowRecordHistory.java
@@ -29,7 +29,7 @@ public class SysWorkflowRecordHistory {
/**
* 下个流程节点id
*/
- private String nextNodeId;
+ private Integer nextNodeId;
/**
* 审批结果,0拒绝 1通过
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java
new file mode 100644
index 00000000..fc611384
--- /dev/null
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java
@@ -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);
+}
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java
index b547d207..da5782fa 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java
@@ -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;
}
}
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml
index 7f7e0530..0b8ae019 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml
@@ -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}
and type_name like concat('%', #{typeName}, '%')
and node_sign_type = #{nodeSignType}
GROUP BY swn.id
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml
new file mode 100644
index 00000000..97fb9982
--- /dev/null
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+ insert into sys_workflow_record_history
+
+ record_id,
+ node_id,
+ next_node_id,
+ is_accept,
+ create_by,
+ create_time,
+ remark,
+
+
+ #{recordId},
+ #{nodeId},
+ #{nextNodeId},
+ #{isAccept},
+ #{createBy},
+ remark,
+
+
+