From c221ee5ff8dcd56dc51e0f5107b9f99cd9df7503 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 6 Nov 2020 09:58:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/app/controller/TestController.java   |  2 +-
 .../service/app/impl/ResultRecordServiceImpl.java   |  5 ++---
 src/main/resources/mapper/flow/FlowRecordMapper.xml | 13 ++++++++-----
 src/test/java/com/lz/mysql/MysqlMain.java           |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java
index 21ea024a..b1255e5d 100644
--- a/src/main/java/com/lz/modules/app/controller/TestController.java
+++ b/src/main/java/com/lz/modules/app/controller/TestController.java
@@ -261,7 +261,7 @@ public class TestController {
         }
     }
 
-    // http://localhost:8080/lz_management/test/resultrecord?resultRecordId=215
+    // http://localhost:8080/lz_management/test/resultrecord?resultRecordId=381
     @RequestMapping("/test/resultrecord")
     public void resultRecorcd(Long resultRecordId) throws Exception{
         R r = resultRecordService.initFlowRecord(resultRecordId);
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index bea5b83b..cf1a99a0 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -773,7 +773,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         }
         List<FlowApprovalRole> flowApprovalRoles =flowApprovalRoleService.selectFlowApprovalRoleList(flowIds);
         int i = 0;
-        List<FlowRecord> flowRecords = new ArrayList<>();
         for (FlowApprovalRole flowApprovalRole : flowApprovalRoles) {
             FlowRecord flowRecord = new FlowRecord();
             flowRecord.setRecordId(resultRecord.getId());
@@ -814,9 +813,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             flowRecord.setFlowIndex(flowApprovalRole.getStepIndex());
             flowRecord.setType(flowApprovalRole.getStepType());         //步骤类型0：依次，1：或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可）
             i++;
-            flowRecords.add(flowRecord);
+            flowRecordService.insertFlowRecord(flowRecord);
         }
-        flowRecordService.insertFlowRecords(flowRecords);
+
         resultRecordService.updateResultRecordById(resultRecord);
         return R.ok();
     }
diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml
index a2b699ae..75b4f8d1 100644
--- a/src/main/resources/mapper/flow/FlowRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml
@@ -21,12 +21,13 @@
         <result column="status_name" property="statusName"/>
         <result column="type" property="type"/>
         <result column="process_id" property="processId"/>
+        <result column="flow_process" property="flowProcess"/>
     </resultMap>
 
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, department_level AS departmentLevel, record_id AS recordId, approval_staff_id AS approvalStaffId, approval_staff_name AS approvalStaffName, flow_name AS flowName, record_staff_id AS recordStaffId, flow_id AS flowId, flow_index AS flowIndex, status AS status, flow_staff_id_role AS flowStaffIdRole, status_name AS statusName, type AS type, process_id AS processId
+        id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, department_level AS departmentLevel, record_id AS recordId, approval_staff_id AS approvalStaffId, approval_staff_name AS approvalStaffName, flow_name AS flowName, record_staff_id AS recordStaffId, flow_id AS flowId, flow_index AS flowIndex, status AS status, flow_staff_id_role AS flowStaffIdRole, status_name AS statusName, type AS type, process_id AS processId, flow_process AS flowProcess
     </sql>
 
 
@@ -52,6 +53,7 @@
         <if test="statusName != null">status_name, </if>
         <if test="type != null">type, </if>
         <if test="processId != null">process_id, </if>
+        <if test="flowProcess != null">flow_process, </if>
         is_delete,
         gmt_create,
         gmt_modified
@@ -69,6 +71,7 @@
         <if test="statusName != null">#{ statusName}, </if>
         <if test="type != null">#{ type}, </if>
         <if test="processId != null">#{ processId}, </if>
+        <if test="flowProcess != null">#{ flowProcess}, </if>
         0,
         now(),
         now()
@@ -94,7 +97,8 @@
             <if test="flowStaffIdRole != null">flow_staff_id_role = #{flowStaffIdRole},</if>
             <if test="statusName != null">status_name = #{statusName},</if>
             <if test="type != null">type = #{type},</if>
-            <if test="processId != null">process_id = #{processId}</if>
+            <if test="processId != null">process_id = #{processId},</if>
+            <if test="flowProcess != null">flow_process = #{flowProcess}</if>
         </trim>
         ,gmt_modified = now()
         where id = #{id}
@@ -119,7 +123,8 @@
             flow_staff_id_role = #{flowStaffIdRole},
             status_name = #{statusName},
             type = #{type},
-            process_id = #{processId}
+            process_id = #{processId},
+            flow_process = #{flowProcess}
         ,gmt_modified = now()
         where id = #{id}
     </update>
@@ -130,8 +135,6 @@
     </update>
 
 
-
-
     <select id="selectLastFlowRecordByRecordId" resultType="com.lz.modules.flow.entity.FlowRecord">
         select * from lz_flow_record  where  is_delete = 0 and record_id = #{recordId} and status = 0  order by id desc  limit 1
     </select>
diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java
index 014f5562..d8784020 100644
--- a/src/test/java/com/lz/mysql/MysqlMain.java
+++ b/src/test/java/com/lz/mysql/MysqlMain.java
@@ -126,7 +126,7 @@ public class MysqlMain {
         List<TablesBean> list = new ArrayList<TablesBean>();
 
 
-        list.add(new TablesBean("lz_evaluation_group"));
+        list.add(new TablesBean("lz_flow_record"));
 
         List<TablesBean> list2 = new ArrayList<TablesBean>();
         Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();