Browse Source

报销详情修改

anderx 2 years ago
parent
commit
82b8e3f74f

+ 2 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -869,7 +869,8 @@
 
 
   <select id="ExpenseDetailsList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountDetailsList">
-    select mea.check_no checkNo ,ead.`type`,ead.amount ,ead.real_amount realAmount ,o.contract_no contractNo ,dep.name applyDepName,
+    select mea.check_no checkNo ,ead.`type`,ead.type_other typeOther,
+           ead.amount ,ead.real_amount realAmount ,o.contract_no contractNo ,dep.name applyDepName,
     dep2.name payDepName ,mea.aname ,ad2.name financeName,a.status ,mea.process_status processStatus ,mea.id mainId,mea.target_type targetType,
     tm.buyer_name buyerName ,date_format(mea.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr
     from expense_account_details  ead left join expense_account a on ead.eaid =a.id

+ 9 - 0
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountDetailsList.java

@@ -13,6 +13,7 @@ public class OutExpenseAccountDetailsList {
      * 8=招待费,9=办公费,10=福利费,11=物业水电费,12=打印费
      */
     private Integer type;
+    private Integer typeOther;
     /**
      * 金额
      */
@@ -63,6 +64,14 @@ public class OutExpenseAccountDetailsList {
     private String createTimeStr;
     private Integer targetType;
 
+    public Integer getTypeOther() {
+        return typeOther;
+    }
+
+    public void setTypeOther(Integer typeOther) {
+        this.typeOther = typeOther;
+    }
+
     public Integer getTargetType() {
         return targetType;
     }