Parcourir la source

1.跟单记录调整

wuhp il y a 2 ans
Parent
commit
f8aa38390d

+ 3 - 2
src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -1205,14 +1205,15 @@ handlingProportion,
     public void updateNoHand(InsPlyIncomeVo insPlyIncomeVo) {
         //        根据协议   如果是含增值税结算   用保费 *   如果是  不含税保费
         InsPlyIncome insPlyIncome = baseMapper.getById(insPlyIncomeVo.getId());
-        BeanUtils.copyProperties(insPlyIncomeVo, insPlyIncome);
-        BigDecimal bigDecimal = this.getBigDecimal(insPlyIncomeVo.getNoPremium(), insPlyIncomeVo.getNoSuperviseCostsProportion());
+        BigDecimal bigDecimal = this.getBigDecimal(insPlyIncome.getNoPremium(), insPlyIncomeVo.getNoSuperviseCostsProportion());
         insPlyIncome.setCommissionFeevalue(bigDecimal);
         insPlyIncome.setCommissionFeerate(insPlyIncomeVo.getNoSuperviseCostsProportion());
         insPlyIncome.setNoSuperviseCostsPremiums(bigDecimal);
         insPlyIncome.setAllFeeValue(bigDecimal);
         insPlyIncome.setUpdateUserId(BaseController.getUser().getId());
+        insPlyIncome.setNoSuperviseCostsProportion(insPlyIncomeVo.getNoSuperviseCostsProportion());
         baseMapper.updateById(insPlyIncome);
+
         insPlyIncomeVo.setOtherFeevalue(insPlyIncomeVo.getNoSuperviseCostsPremiums());
         insPlyIncomeVo.setCrudStatus("2");
         this.saveLog(insPlyIncomeVo);

+ 1 - 0
src/main/resources/mapper/modules/fnc/SettlementDocumentaryFeesMapper.xml

@@ -102,6 +102,7 @@
         select
             max(a.settlement_time) as "settlementTime",
             sum(a.settlement_amount) as "settlementAmount",
+            sum(a.expend_amount) as "expendAmount",
             max(upf.url )  as "imageUrl"
             from  settlement_documentary_fees  a
             LEFT  JOIN   ins_upload_files  upf   on  a.settlement_image_id=upf.id