Browse Source

审核日志列表修改

anderx 2 years ago
parent
commit
fae91d0434

+ 1 - 1
src/main/java/com/goafanti/common/dao/ExpenseAccountExamineMapper.java

@@ -22,5 +22,5 @@ public interface ExpenseAccountExamineMapper {
 
     void updateStatusByEaidAndAid(@Param("id") Integer id, @Param("aid") String aid,@Param("status") Integer status);
 
-    List<ExpenseAccountExamine> selectByEaidAndType(@Param("id") Integer id, @Param("type") Integer type);
+    List<ExpenseAccountExamine> selectByEaidAndType(@Param("id") Integer id, @Param("processStatus") Integer type);
 }

+ 14 - 15
src/main/java/com/goafanti/common/mapper/ExpenseAccountExamineMapper.xml

@@ -4,14 +4,14 @@
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.ExpenseAccountExamine">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="eaid" jdbcType="INTEGER" property="eaid" />
-    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="process_status" jdbcType="INTEGER" property="processStatus" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="auditor" jdbcType="VARCHAR" property="auditor" />
     <result column="auditorName" jdbcType="VARCHAR" property="auditorname" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, eaid, `type`, `status`, auditor, auditorName, create_time
+    id, eaid, process_status, `status`, auditor, auditorName, create_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -19,16 +19,15 @@
     from expense_account_examine
     where id = #{id,jdbcType=INTEGER}
   </select>
-
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from expense_account_examine
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.ExpenseAccountExamine" useGeneratedKeys="true">
-    insert into expense_account_examine (eaid, `type`, `status`,
+    insert into expense_account_examine (eaid, process_status, `status`,
       auditor, auditorName, create_time
       )
-    values (#{eaid,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
+    values (#{eaid,jdbcType=INTEGER}, #{processStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
       #{auditor,jdbcType=VARCHAR}, #{auditorname,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -38,8 +37,8 @@
       <if test="eaid != null">
         eaid,
       </if>
-      <if test="type != null">
-        `type`,
+      <if test="processStatus != null">
+        process_status,
       </if>
       <if test="status != null">
         `status`,
@@ -58,8 +57,8 @@
       <if test="eaid != null">
         #{eaid,jdbcType=INTEGER},
       </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
+      <if test="processStatus != null">
+        #{processStatus,jdbcType=INTEGER},
       </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
@@ -81,8 +80,8 @@
       <if test="eaid != null">
         eaid = #{eaid,jdbcType=INTEGER},
       </if>
-      <if test="type != null">
-        `type` = #{type,jdbcType=INTEGER},
+      <if test="processStatus != null">
+        process_status = #{processStatus,jdbcType=INTEGER},
       </if>
       <if test="status != null">
         `status` = #{status,jdbcType=INTEGER},
@@ -102,7 +101,7 @@
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.ExpenseAccountExamine">
     update expense_account_examine
     set eaid = #{eaid,jdbcType=INTEGER},
-      `type` = #{type,jdbcType=INTEGER},
+      process_status = #{processStatus,jdbcType=INTEGER},
       `status` = #{status,jdbcType=INTEGER},
       auditor = #{auditor,jdbcType=VARCHAR},
       auditorName = #{auditorname,jdbcType=VARCHAR},
@@ -113,10 +112,10 @@
 
 
   <insert id="insertBatch">
-    insert into expense_account_examine (eaid,type, `status`, auditor, auditorName)
+    insert into expense_account_examine (eaid,process_status, `status`, auditor, auditorName)
     values
     <foreach  collection="list" item="e" separator=",">
-      (#{e.eaid,jdbcType=INTEGER},#{e.type}, #{e.status,jdbcType=INTEGER}, #{e.auditor,jdbcType=VARCHAR},
+      (#{e.eaid,jdbcType=INTEGER},#{e.processStatus}, #{e.status,jdbcType=INTEGER}, #{e.auditor,jdbcType=VARCHAR},
       #{e.auditorname,jdbcType=VARCHAR})
     </foreach>
   </insert>
@@ -133,6 +132,6 @@
     select
     <include refid="Base_Column_List" />
     from expense_account_examine
-    where eaid = #{id} and type= #{type}
+    where eaid = #{id} and process_status= #{processStatus}
   </select>
 </mapper>

+ 8 - 8
src/main/java/com/goafanti/common/model/ExpenseAccountExamine.java

@@ -19,9 +19,9 @@ public class ExpenseAccountExamine implements Serializable {
     private Integer eaid;
 
     /**
-     * 流程截点 1=上级,2=财务,3=管理员,4=总裁/董事长
+     * 流程状态 0=巴员发起,1=巴主发起或审核,2=总经理审核,3=财务审核,4=董事长审核
      */
-    private Integer type;
+    private Integer processStatus;
 
     /**
      * 状态 0=未审核,1=已审核
@@ -48,9 +48,9 @@ public class ExpenseAccountExamine implements Serializable {
     public ExpenseAccountExamine() {
     }
 
-    public ExpenseAccountExamine(Integer eaid, Integer type) {
+    public ExpenseAccountExamine(Integer eaid, Integer processStatus) {
         this.eaid = eaid;
-        this.type = type;
+        this.processStatus = processStatus;
     }
 
     public Integer getId() {
@@ -69,12 +69,12 @@ public class ExpenseAccountExamine implements Serializable {
         this.eaid = eaid;
     }
 
-    public Integer getType() {
-        return type;
+    public Integer getProcessStatus() {
+        return processStatus;
     }
 
-    public void setType(Integer type) {
-        this.type = type;
+    public void setProcessStatus(Integer processStatus) {
+        this.processStatus = processStatus;
     }
 
     public Integer getStatus() {