Browse Source

修改列表

anderx 2 years ago
parent
commit
37e7a64696

+ 29 - 4
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -26,12 +26,14 @@
     <result column="settlement_amount" jdbcType="DECIMAL" property="settlementAmount" />
     <result column="debit_id" jdbcType="INTEGER" property="debitId" />
     <result column="target_type" jdbcType="INTEGER" property="targetType" />
+    <result column="liquidation_status" jdbcType="INTEGER" property="liquidationStatus" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
   </resultMap>
   <sql id="Base_Column_List">
     id, prid, order_no, aid, aname, `type`, type_other, `status`, process_status, total_amount,
     attachment_url, apply_dep, pay_dep, eaaid, create_time, district_name, user_names,
     release_start, release_end, duration, examine_name, settlement_amount, debit_id,
-    target_type
+    target_type, liquidation_status, remarks
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -51,7 +53,8 @@
       eaaid, create_time, district_name,
       user_names, release_start, release_end,
       duration, examine_name, settlement_amount,
-      debit_id, target_type)
+      debit_id, target_type, liquidation_status,
+      remarks)
     values (#{prid,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR},
       #{aname,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{typeOther,jdbcType=VARCHAR},
       #{status,jdbcType=INTEGER}, #{processStatus,jdbcType=INTEGER}, #{totalAmount,jdbcType=DECIMAL},
@@ -59,7 +62,8 @@
       #{eaaid,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{districtName,jdbcType=VARCHAR},
       #{userNames,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP},
       #{duration,jdbcType=DOUBLE}, #{examineName,jdbcType=VARCHAR}, #{settlementAmount,jdbcType=DECIMAL},
-      #{debitId,jdbcType=INTEGER}, #{targetType,jdbcType=INTEGER})
+      #{debitId,jdbcType=INTEGER}, #{targetType,jdbcType=INTEGER}, #{liquidationStatus,jdbcType=INTEGER},
+      #{remarks,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.ExpenseAccount" useGeneratedKeys="true">
     insert into expense_account
@@ -133,6 +137,12 @@
       <if test="targetType != null">
         target_type,
       </if>
+      <if test="liquidationStatus != null">
+        liquidation_status,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="prid != null">
@@ -204,6 +214,12 @@
       <if test="targetType != null">
         #{targetType,jdbcType=INTEGER},
       </if>
+      <if test="liquidationStatus != null">
+        #{liquidationStatus,jdbcType=INTEGER},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.ExpenseAccount">
@@ -278,6 +294,12 @@
       <if test="targetType != null">
         target_type = #{targetType,jdbcType=INTEGER},
       </if>
+      <if test="liquidationStatus != null">
+        liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -305,7 +327,9 @@
       examine_name = #{examineName,jdbcType=VARCHAR},
       settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
       debit_id = #{debitId,jdbcType=INTEGER},
-      target_type = #{targetType,jdbcType=INTEGER}
+      target_type = #{targetType,jdbcType=INTEGER},
+      liquidation_status = #{liquidationStatus,jdbcType=INTEGER},
+      remarks = #{remarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -315,6 +339,7 @@
         a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
         a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name appDepName,
         c.name payDepName,d.name ,d.bank ,d.accounts ,a.settlement_amount settlementAmount,
+        a.liquidation_status liquidationStatus, a.remarks,
            date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
             date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
             date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr

+ 26 - 0
src/main/java/com/goafanti/common/model/ExpenseAccount.java

@@ -126,6 +126,16 @@ public class ExpenseAccount implements Serializable {
      */
     private Integer targetType;
 
+    /**
+     * 清算状态 0-未抵扣,1=已抵扣,未全款,2=已全款
+     */
+    private Integer liquidationStatus;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -319,4 +329,20 @@ public class ExpenseAccount implements Serializable {
     public void setTargetType(Integer targetType) {
         this.targetType = targetType;
     }
+
+    public Integer getLiquidationStatus() {
+        return liquidationStatus;
+    }
+
+    public void setLiquidationStatus(Integer liquidationStatus) {
+        this.liquidationStatus = liquidationStatus;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
 }