anderx hai 1 ano
pai
achega
b85c6eaeeb

+ 20 - 11
src/main/java/com/goafanti/common/mapper/ExpenseAccountLogMapper.xml

@@ -9,9 +9,10 @@
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="auditor" jdbcType="VARCHAR" property="auditor" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="show_status" jdbcType="INTEGER" property="showStatus" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, eaid, process_status, `status`, remarks, auditor, create_time
+    id, eaid, process_status, `status`, remarks, auditor, create_time, show_status
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -23,14 +24,13 @@
     delete from expense_account_log
     where id = #{id,jdbcType=INTEGER}
   </delete>
-
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.ExpenseAccountLog" useGeneratedKeys="true">
     insert into expense_account_log (eaid, process_status, `status`,
-      remarks, auditor, create_time
-      )
+      remarks, auditor, create_time,
+      show_status)
     values (#{eaid,jdbcType=INTEGER}, #{processStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
-      #{remarks,jdbcType=VARCHAR}, #{auditor,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{remarks,jdbcType=VARCHAR}, #{auditor,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{showStatus,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.ExpenseAccountLog" useGeneratedKeys="true">
     insert into expense_account_log
@@ -53,6 +53,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="showStatus != null">
+        show_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="eaid != null">
@@ -73,9 +76,11 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="showStatus != null">
+        #{showStatus,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
-
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.ExpenseAccountLog">
     update expense_account_log
     <set>
@@ -97,6 +102,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="showStatus != null">
+        show_status = #{showStatus,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -107,7 +115,8 @@
       `status` = #{status,jdbcType=INTEGER},
       remarks = #{remarks,jdbcType=VARCHAR},
       auditor = #{auditor,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      show_status = #{showStatus,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -132,13 +141,13 @@
 
   <insert id="insertBatch" >
     insert into expense_account_log (eaid, process_status, `status`,
-                                     remarks, auditor, create_time
+                                     remarks, auditor, create_time,show_status
     )
     values
         <foreach collection="list" item="item" index="index" separator=",">
         (#{item.eaid,jdbcType=INTEGER}, #{item.processStatus,jdbcType=INTEGER}, #{item.status,jdbcType=INTEGER},
-            #{item.remarks,jdbcType=VARCHAR}, #{item.auditor,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}
-           )
+            #{item.remarks,jdbcType=VARCHAR}, #{item.auditor,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+          #{item.showStatus,jdbcType=INTEGER})
         </foreach>
   </insert>
 </mapper>

+ 15 - 2
src/main/java/com/goafanti/common/model/ExpenseAccountLog.java

@@ -19,12 +19,12 @@ public class ExpenseAccountLog implements Serializable {
     private Integer eaid;
 
     /**
-     * 流程状态 0=巴员发起,1=巴主发起或审核,2=总经理审核,3=财务审核,4=董事长审核
+     * 流程状态 0=成员发起,1=上级审核,2=部门负责人审核,3=财务审核,4=财务复审,5=董事长,6=财务管理员,7=公司副总,8=出纳
      */
     private Integer processStatus;
 
     /**
-     * 状态 0发起 1通过 2完成 3驳回
+     * 状态 0发起 1通过 2完成 3驳回 4撤销 5修改
      */
     private Integer status;
 
@@ -43,6 +43,11 @@ public class ExpenseAccountLog implements Serializable {
      */
     private Date createTime;
 
+    /**
+     * 0=正常,1=旧日志,2=跳过日志
+     */
+    private Integer showStatus;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -100,4 +105,12 @@ public class ExpenseAccountLog implements Serializable {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public Integer getShowStatus() {
+        return showStatus;
+    }
+
+    public void setShowStatus(Integer showStatus) {
+        this.showStatus = showStatus;
+    }
 }