Selaa lähdekoodia

报销列表BUG修复

anderx 2 vuotta sitten
vanhempi
commit
0827b03c54

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

@@ -940,7 +940,7 @@
     left join t_order_new o on mea.order_no =o.order_no left join t_order_mid tm on o.order_no =tm.order_no
     left join department dep on mea.apply_dep =dep.id
     left join department dep2 on mea.pay_dep =dep2.id  left join  admin ad on a.aid=ad.id
-    left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep3.finance_id =ad2.id
+    left join department dep3 on ad.department_id =dep3.id left join admin ad2 on dep.expense_finance_id =ad2.id
     where 1=1
    <include refid="ExpenseDetailsSql"/>
     ${page_sql}

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

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