Browse Source

报销列表修改

anderx 2 years ago
parent
commit
2cac8025b8
1 changed files with 10 additions and 9 deletions
  1. 10 9
      src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

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

@@ -830,13 +830,13 @@
 
 
     <select id="ExpenseMainList" resultMap="MainMap">
-    select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no ,b.aname,b.apply_dep,b.pay_dep,b.amount,
-    date_format(b.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.status,b.process_status,b.examine_name,
-    dep.name applyDepName,dep2.name payDepName, b.remarks,b.eaaid
-    from  expense_account b  left join department dep on b.apply_dep =dep.id
-    left join department dep2 on b.pay_dep =dep2.id left join t_order_new o on b.order_no =o.order_no
-    left join admin ad on b.aid=ad.id
-    left join department adDep on ad.department_id=adDep.id
+      select b.id,b.check_no,b.total_amount,b.real_amount ,b.order_no,o.contract_no ,b.aname,b.apply_dep,b.pay_dep,b.amount,
+      date_format(b.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.status,b.process_status,b.examine_name,
+      dep.name applyDepName,dep2.name payDepName, b.remarks,b.eaaid
+      from  expense_account b  left join department dep on b.apply_dep =dep.id
+      left join department dep2 on b.pay_dep =dep2.id left join t_order_new o on b.order_no =o.order_no
+      left join admin ad on b.aid=ad.id
+      left join department adDep on ad.department_id=adDep.id
     <if test="roleType == 1">
       inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
       where auditor= #{aid} group by eaid) eae on b.id=eae.eaid
@@ -1005,8 +1005,9 @@
   </select>
   <select id="selectSonByMainIds" resultMap="MainMap">
     select b.id,
-           c.id sonId,c.total_amount sonTotalAmount,c.settlement_amount sonSettlementAmount,c.amount sonAmount,c.`type` sonType,c.type_other sonTypeOTher,
-           c.user_names ,c.release_start ,c.release_end, c.attachment_url attachmentUrl,c.secondary_type,c.secondary_type_other
+           c.id sonId,c.total_amount sonTotalAmount,c.settlement_amount sonSettlementAmount,c.amount sonAmount,c.real_amount sonRealAmount,
+           c.`type` sonType,c.type_other sonTypeOTher, c.user_names ,c.release_start ,c.release_end,
+           c.attachment_url attachmentUrl,c.secondary_type,c.secondary_type_other
     from expense_relationship a
            left join expense_account b on a.id =b.id
            left join department dep on b.apply_dep =dep.id left join department dep2 on b.pay_dep =dep2.id