Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowRecordHistory.java

@@ -0,0 +1,54 @@
+package com.bonus.material.work.domain;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.Date;
+
+@Data
+@ToString
+public class SysWorkflowRecordHistory {
+
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 所属记录
+     */
+    private Integer recordId;
+
+    /**
+     * 执行流程节点id
+     */
+    private Integer nodeId;
+
+    /**
+     * 下个流程节点id
+     */
+    private String nextNodeId;
+
+    /**
+     * 审批结果，0拒绝 1通过
+     */
+    private Integer isAccept;
+
+    /**
+     * 操作人名称
+     */
+    private String createBy;
+
+    /**
+     * 执行时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 备注 意见 驳回原因
+     */
+    private String remark;
+}

bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/SysWorkflowRecordService.java

@@ -3,6 +3,6 @@ package com.bonus.material.work.service;
 
 public interface SysWorkflowRecordService {
 
-    int addSysWorkflowRecord(int taskId,String taskCode);
+    int addSysWorkflowRecord(int taskId,String taskCode,int taskType);
 
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordServiceImpl.java

@@ -2,11 +2,13 @@ package com.bonus.material.work.service.impl;
 
 import com.bonus.common.core.exception.ServiceException;
 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.SysWorkflowRecordMapper;
 import com.bonus.material.work.mapper.SysWorkflowTypeMapper;
 import com.bonus.material.work.service.SysWorkflowRecordService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -21,10 +23,11 @@ public class SysWorkflowRecordServiceImpl implements SysWorkflowRecordService {
     private SysWorkflowTypeMapper sysWorkflowTypeMapper;
 
     @Override
-    public int addSysWorkflowRecord(int taskId,String taskCode) {
+    @Transactional
+    public int addSysWorkflowRecord(int taskId,String taskCode,int taskType) {
         //获取审批流id
         SysWorkflowType sysWorkflowType = new SysWorkflowType();
-        sysWorkflowType.setTaskType(2);
+        sysWorkflowType.setTaskType(taskType);
         sysWorkflowType.setIsEnable(1);
         List<SysWorkflowType> sysWorkflowTypeList =sysWorkflowTypeMapper.selectSysWorkflowTypeList(sysWorkflowType);
         if (sysWorkflowTypeList.size()<1){
@@ -38,6 +41,9 @@ public class SysWorkflowRecordServiceImpl implements SysWorkflowRecordService {
         sysWorkflowRecord.setTaskCode(taskCode);
         //创建审批任务
         int count = sysWorkflowRecordMapper.addSysWorkflowRecord(sysWorkflowRecord);
+        //创建审核记录
+        SysWorkflowRecordHistory sysWorkflowRecordHistory = new SysWorkflowRecordHistory();
+        sysWorkflowRecordHistory.setRecordId(sysWorkflowRecord.getId());
         return count;
     }
 }

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

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.bonus.material.work.mapper.SysWorkflowRecordMapper">
 
 
-    <insert id="addSysWorkflowRecord">
+    <insert id="addSysWorkflowRecord" useGeneratedKeys="true" keyProperty="id">
         insert into sys_workflow_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="taskId != null">task_id,</if>