Explorar o código

Merge branch 'test02' into test

anderx %!s(int64=2) %!d(string=hai) anos
pai
achega
1fb918faad

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

@@ -940,7 +940,8 @@
   <select id="ExpenseDetailsList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountDetailsList">
     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,
+    a.type sonType ,a.type_other sonTypeOther ,
+    dep2.name payDepName ,a.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
     left join expense_relationship er on a.id=er.ea_id  left join expense_account mea on  er.id=mea.id

+ 19 - 1
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountDetailsList.java

@@ -14,6 +14,8 @@ public class OutExpenseAccountDetailsList {
      */
     private Integer type;
     private String  typeOther;
+    private Integer sonType;
+    private String  sonTypeOther;
     /**
      * 金额
      */
@@ -64,7 +66,7 @@ public class OutExpenseAccountDetailsList {
     private String createTimeStr;
     private Integer targetType;
 
-    public String  getTypeOther() {
+    public String getTypeOther() {
         return typeOther;
     }
 
@@ -72,6 +74,22 @@ public class OutExpenseAccountDetailsList {
         this.typeOther = typeOther;
     }
 
+    public Integer getSonType() {
+        return sonType;
+    }
+
+    public void setSonType(Integer sonType) {
+        this.sonType = sonType;
+    }
+
+    public String getSonTypeOther() {
+        return sonTypeOther;
+    }
+
+    public void setSonTypeOther(String sonTypeOther) {
+        this.sonTypeOther = sonTypeOther;
+    }
+
     public Integer getTargetType() {
         return targetType;
     }