From 5c896280de5772c59b25796bb35e297b1f5e6f45 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 26 Oct 2020 15:35:39 +0800
Subject: [PATCH] =?UTF-8?q?flowchart=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lz/modules/flow/entity/FlowChart.java | 34 ++++++++++---
 .../resources/mapper/flow/FlowChartMapper.xml | 49 ++++++++++---------
 src/test/java/com/lz/mysql/MysqlMain.java     |  2 +-
 3 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/entity/FlowChart.java b/src/main/java/com/lz/modules/flow/entity/FlowChart.java
index f07f6891..8a905d87 100644
--- a/src/main/java/com/lz/modules/flow/entity/FlowChart.java
+++ b/src/main/java/com/lz/modules/flow/entity/FlowChart.java
@@ -8,10 +8,9 @@ import lombok.Data;
 import java.util.Date;
 /**
 * <p>
-* 菜单权限表
 * </p>*流程图，lz_flow的父
 * @author quyixiao
-* @since 2020-10-14
+* @since 2020-10-26
 */
 
 @Data
@@ -39,12 +38,15 @@ public class FlowChart implements java.io.Serializable {
     //是否可允许不启用节点 0不可，1可以
     @ApiModelProperty(value = "是否可允许不启用节点 0不可，1可以", name = "status")
     private Integer status;
-    //1可配置细节，0不可配置细节，一般线下操作。比如执行中
-    @ApiModelProperty(value = "1可配置细节，0不可配置细节，一般线下操作。比如执行中", name = "type")
+    //1可配置细节，0不可配置细节，一般线下操作。比如执行中，不可配置细节的允许自动跳过该节点。比如，还未到改节点时，人为设置该节点后面的操作，那么所有相关的都自动跳过
+    @ApiModelProperty(value = "1可配置细节，0不可配置细节，一般线下操作。比如执行中，不可配置细节的允许自动跳过该节点。比如，还未到改节点时，人为设置该节点后面的操作，那么所有相关的都自动跳过", name = "type")
     private Integer type;
     //执行步骤，第几步，从0开始
     @ApiModelProperty(value = "执行步骤，第几步，从0开始", name = "stepIndex")
     private Integer stepIndex;
+    //当前是目标确认还是评分，0，目标制定，1，目标确认，2执行中，3，结果值录入，4，评分，5考核结束
+    @ApiModelProperty(value = "当前是目标确认还是评分，0，目标制定，1，目标确认，2执行中，3，结果值录入，4，评分，5考核结束", name = "flowProcess")
+    private Integer flowProcess;
     /**
      *  
      * @return
@@ -136,14 +138,14 @@ public class FlowChart implements java.io.Serializable {
     }
 
     /**
-     * 0启用，1不启用 
+     * 是否可允许不启用节点 0不可，1可以 
      * @return
      */
     public Integer getStatus() {
         return status;
     }
     /**
-     * 0启用，1不启用 
+     * 是否可允许不启用节点 0不可，1可以 
      * @param status
      */
     public void setStatus(Integer status) {
@@ -151,14 +153,14 @@ public class FlowChart implements java.io.Serializable {
     }
 
     /**
-     * 1可配置细节，0不可配置细节，一般线下操作。比如执行中 
+     * 1可配置细节，0不可配置细节，一般线下操作。比如执行中，不可配置细节的允许自动跳过该节点。比如，还未到改节点时，人为设置该节点后面的操作，那么所有相关的都自动跳过 
      * @return
      */
     public Integer getType() {
         return type;
     }
     /**
-     * 1可配置细节，0不可配置细节，一般线下操作。比如执行中 
+     * 1可配置细节，0不可配置细节，一般线下操作。比如执行中，不可配置细节的允许自动跳过该节点。比如，还未到改节点时，人为设置该节点后面的操作，那么所有相关的都自动跳过 
      * @param type
      */
     public void setType(Integer type) {
@@ -180,6 +182,21 @@ public class FlowChart implements java.io.Serializable {
         this.stepIndex = stepIndex;
     }
 
+    /**
+     * 当前是目标确认还是评分，0，目标制定，1，目标确认，2执行中，3，结果值录入，4，评分，5考核结束 
+     * @return
+     */
+    public Integer getFlowProcess() {
+        return flowProcess;
+    }
+    /**
+     * 当前是目标确认还是评分，0，目标制定，1，目标确认，2执行中，3，结果值录入，4，评分，5考核结束 
+     * @param flowProcess
+     */
+    public void setFlowProcess(Integer flowProcess) {
+        this.flowProcess = flowProcess;
+    }
+
     @Override
     public String toString() {
         return "FlowChart{" +
@@ -192,6 +209,7 @@ public class FlowChart implements java.io.Serializable {
                 ",status=" + status +
                 ",type=" + type +
                 ",stepIndex=" + stepIndex +
+                ",flowProcess=" + flowProcess +
                 "}";
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/flow/FlowChartMapper.xml b/src/main/resources/mapper/flow/FlowChartMapper.xml
index 805a0347..009a4bff 100644
--- a/src/main/resources/mapper/flow/FlowChartMapper.xml
+++ b/src/main/resources/mapper/flow/FlowChartMapper.xml
@@ -13,12 +13,13 @@
         <result column="status" property="status"/>
         <result column="type" property="type"/>
         <result column="step_index" property="stepIndex"/>
+        <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, name AS name, process_id AS processId, status AS status, type AS type, step_index AS stepIndex
+        id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, process_id AS processId, status AS status, type AS type, step_index AS stepIndex, flow_process AS flowProcess
     </sql>
 
 
@@ -31,30 +32,32 @@
 
     <insert id="insertFlowChart" parameterType="FlowChart" useGeneratedKeys="true" keyProperty="id" >
         insert into lz_flow_chart(
-            <if test="name != null">name, </if>
-            <if test="processId != null">process_id, </if>
-            <if test="status != null">status, </if>
-            <if test="type != null">type, </if>
-            <if test="stepIndex != null">step_index, </if>
-            is_delete,
-            gmt_create,
-            gmt_modified
+        <if test="name != null">name, </if>
+        <if test="processId != null">process_id, </if>
+        <if test="status != null">status, </if>
+        <if test="type != null">type, </if>
+        <if test="stepIndex != null">step_index, </if>
+        <if test="flowProcess != null">flow_process, </if>
+        is_delete,
+        gmt_create,
+        gmt_modified
         )values(
-            <if test="name != null">#{ name}, </if>
-            <if test="processId != null">#{ processId}, </if>
-            <if test="status != null">#{ status}, </if>
-            <if test="type != null">#{ type}, </if>
-            <if test="stepIndex != null">#{ stepIndex}, </if>
-            0,
-            now(),
-            now()
+        <if test="name != null">#{ name}, </if>
+        <if test="processId != null">#{ processId}, </if>
+        <if test="status != null">#{ status}, </if>
+        <if test="type != null">#{ type}, </if>
+        <if test="stepIndex != null">#{ stepIndex}, </if>
+        <if test="flowProcess != null">#{ flowProcess}, </if>
+        0,
+        now(),
+        now()
         )
     </insert>
 
 
     <update id="updateFlowChartById" parameterType="FlowChart" >
         update
-            lz_flow_chart
+        lz_flow_chart
         <trim prefix="set" suffixOverrides=",">
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
@@ -62,7 +65,8 @@
             <if test="processId != null">process_id = #{processId},</if>
             <if test="status != null">status = #{status},</if>
             <if test="type != null">type = #{type},</if>
-            <if test="stepIndex != null">step_index = #{stepIndex}</if>                
+            <if test="stepIndex != null">step_index = #{stepIndex},</if>
+            <if test="flowProcess != null">flow_process = #{flowProcess}</if>
         </trim>
         ,gmt_modified = now()
         where id = #{id}
@@ -71,15 +75,16 @@
 
     <update id="updateCoverFlowChartById" parameterType="FlowChart" >
         update
-            lz_flow_chart    
-        set     
+            lz_flow_chart
+        set
             is_delete = #{isDelete},
             gmt_create = #{gmtCreate},
             name = #{name},
             process_id = #{processId},
             status = #{status},
             type = #{type},
-            step_index = #{stepIndex}                
+            step_index = #{stepIndex},
+            flow_process = #{flowProcess}
         ,gmt_modified = now()
         where id = #{id}
     </update>
diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java
index f3e5c41d..b9a6be0a 100644
--- a/src/test/java/com/lz/mysql/MysqlMain.java
+++ b/src/test/java/com/lz/mysql/MysqlMain.java
@@ -96,7 +96,7 @@ public class MysqlMain {
         //list.add(new TablesBean("lz_flow_chart_detail_record"));
         //list.add(new TablesBean("lz_flow_approval_role"));
 
-        list.add(new TablesBean("lz_flow_record"));
+        list.add(new TablesBean("lz_flow_chart"));
 
         List<TablesBean> list2 = new ArrayList<TablesBean>();
         Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();