Browse Source

报销开发子报销列表新增字段

anderx 2 years ago
parent
commit
5756bc2fb8

+ 17 - 6
src/main/java/com/goafanti/common/mapper/ExpenseAccountDetailsMapper.xml

@@ -24,11 +24,12 @@
     <result column="lend_id" jdbcType="INTEGER" property="lendId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="real_amount" jdbcType="DECIMAL" property="realAmount" />
+    <result column="type_other" jdbcType="VARCHAR" property="typeOther" />
   </resultMap>
   <sql id="Base_Column_List">
     id, eaid, `type`, start_time, end_time, start_district, end_district, amount, vehicle,
     vehicle_other, remarks, agree_time, pay_type, invoice_type, invoice_no, payer_name,
-    open_bank, bank_accounts, open_bank_address, lend_id, create_time, real_amount
+    open_bank, bank_accounts, open_bank_address, lend_id, create_time, real_amount, type_other
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -47,16 +48,16 @@
       remarks, agree_time, pay_type,
       invoice_type, invoice_no, payer_name,
       open_bank, bank_accounts, open_bank_address,
-      lend_id, create_time, real_amount
-      )
+      lend_id, create_time, real_amount,
+      type_other)
     values (#{eaid,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{startTime,jdbcType=TIMESTAMP},
       #{endTime,jdbcType=TIMESTAMP}, #{startDistrict,jdbcType=VARCHAR}, #{endDistrict,jdbcType=VARCHAR},
       #{amount,jdbcType=DECIMAL}, #{vehicle,jdbcType=INTEGER}, #{vehicleOther,jdbcType=VARCHAR},
       #{remarks,jdbcType=VARCHAR}, #{agreeTime,jdbcType=TIMESTAMP}, #{payType,jdbcType=INTEGER},
       #{invoiceType,jdbcType=INTEGER}, #{invoiceNo,jdbcType=VARCHAR}, #{payerName,jdbcType=VARCHAR},
       #{openBank,jdbcType=VARCHAR}, #{bankAccounts,jdbcType=VARCHAR}, #{openBankAddress,jdbcType=VARCHAR},
-      #{lendId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{realAmount,jdbcType=DECIMAL}
-      )
+      #{lendId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{realAmount,jdbcType=DECIMAL},
+      #{typeOther,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.ExpenseAccountDetails" useGeneratedKeys="true">
     insert into expense_account_details
@@ -124,6 +125,9 @@
       <if test="realAmount != null">
         real_amount,
       </if>
+      <if test="typeOther != null">
+        type_other,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="eaid != null">
@@ -189,6 +193,9 @@
       <if test="realAmount != null">
         #{realAmount,jdbcType=DECIMAL},
       </if>
+      <if test="typeOther != null">
+        #{typeOther,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.ExpenseAccountDetails">
@@ -257,6 +264,9 @@
       <if test="realAmount != null">
         real_amount = #{realAmount,jdbcType=DECIMAL},
       </if>
+      <if test="typeOther != null">
+        type_other = #{typeOther,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -282,7 +292,8 @@
       open_bank_address = #{openBankAddress,jdbcType=VARCHAR},
       lend_id = #{lendId,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      real_amount = #{realAmount,jdbcType=DECIMAL}
+      real_amount = #{realAmount,jdbcType=DECIMAL},
+      type_other = #{typeOther,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

+ 16 - 2
src/main/java/com/goafanti/common/model/ExpenseAccountDetails.java

@@ -17,7 +17,8 @@ public class ExpenseAccountDetails implements Serializable {
     private Integer eaid;
 
     /**
-     * 分类 0=其他,1=交通费,2=住宿费,3=市内车费,4=餐费,5=出差补贴,6=预借支
+     * 0=其他,1=交通费,2=住宿费,3=市内车费,4=餐费,5=出差补贴,6=预借支,7=油费
+8=招待费,9=办公费,10=福利费,11=物业水电费,12=打印费
      */
     private Integer type;
 
@@ -67,7 +68,7 @@ public class ExpenseAccountDetails implements Serializable {
     private Date agreeTime;
 
     /**
-     * 付款方式 
+     * 付款方式
      */
     private Integer payType;
 
@@ -116,6 +117,11 @@ public class ExpenseAccountDetails implements Serializable {
      */
     private BigDecimal realAmount;
 
+    /**
+     * 其他状态说明
+     */
+    private String typeOther;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -293,4 +299,12 @@ public class ExpenseAccountDetails implements Serializable {
     public void setRealAmount(BigDecimal realAmount) {
         this.realAmount = realAmount;
     }
+
+    public String getTypeOther() {
+        return typeOther;
+    }
+
+    public void setTypeOther(String typeOther) {
+        this.typeOther = typeOther;
+    }
 }