Explorar o código

报销金额与实报金额的区分

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

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

@@ -409,7 +409,7 @@
     a.id, a.prid, a.order_no orderNo, o.contract_no contractNo ,tm.buyer_name buyerName, a.aid, a.aname, a.`type`,
         a.type_other typeOther , a.status,a.process_status processStatus,a.total_amount totalAmount,a.debit_id debitId,
         a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
-        a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name applyDepName,
+        a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name applyDepName,a.amount,
         c.name payDepName,d.name ,d.bank ,d.accounts ,a.settlement_amount settlementAmount,a.secondary_type secondaryType,
         a.liquidation_status liquidationStatus, a.remarks,a.check_no checkNo,a.secondary_type_other secondaryTypeOther,
            date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
@@ -797,7 +797,7 @@
       from expense_account_details a left join expense_account b on a.eaid =b.id
       left join expense_account_details c on b.id =c.eaid
       where a.id= #{id} group by b.id)y
-    set x.real_amount =y.amount
+    set x.real_amount =y.amount,x.total_amount =y.amount,x.amount=y.amount
     where x.id=y.id;
   </update>
   <update id="updateMainByDetId">
@@ -817,7 +817,7 @@
     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(a.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 ,
-    c.id sonId,,c.total_amount sonTotalAmount,c.settlement_amount sonSettlementAmount,c.amount sonAmount,c.`type` sonType,c.type_other sonTypeOTher,
+    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
     from expense_relationship a
     left join expense_account b on a.id =b.id

+ 2 - 3
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -72,8 +72,7 @@ public class ExpenseAccountController extends CertifyApiController {
                     return res;
                 }
             }
-            in.setAmount(in.getTotalAmount().subtract(in.getSettlementAmount()));
-            in.setRealAmount(in.getAmount());
+
             res.setData(expenseAccountService.update(in));
         }
         return res;
@@ -185,7 +184,7 @@ public class ExpenseAccountController extends CertifyApiController {
     }
 
     /**
-     * 删除报销详情
+     * 报销详情
      * @param eaid
      * @return
      */

+ 6 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -277,6 +277,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 pushresettingDebit(in,useEA.getDebitId());
             }
         }
+        if (in.getSettlementAmount()==null)in.setSettlementAmount(useEA.getSettlementAmount());
+        in.setAmount(in.getTotalAmount().subtract(in.getSettlementAmount()));
+        in.setRealAmount(in.getAmount());
         in.setStatus(0);
         return expenseAccountMapper.updateByPrimaryKeySelective(in);
     }
@@ -341,7 +344,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             }
         }
         in.setRealAmount(in.getAmount());
-        return expenseAccountDetailsMapper.insertSelective(in);
+        expenseAccountDetailsMapper.insertSelective(in);
+        expenseAccountMapper.updateSonByDetId(in.getId());
+        return 1;
     }
 
     @Override