Explorar o código

批量修改逻辑调整

lipf hai 3 meses
pai
achega
25cab911ec

+ 4 - 2
tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -443,10 +443,12 @@ public class ReceivableController {
         Page<InsPlyIncome> data = receivableService.getPlatFormReceivableList(receivableQueryVo);
         List<InsPlyIncomeOrder> receivablePageIds = receivableService.getReceivablePageIds(receivableQueryVo);
         //满足条件的的总的应收
-        BigDecimal totalReceivablePremium = null;
+        BigDecimal totalReceivablePremium = BigDecimal.ZERO;
         try{
             List<String> orderNos = receivablePageIds.stream().map(InsPlyIncomeOrder::getOrderNo).distinct().toList();
-            totalReceivablePremium = receivableService.queryAllTotalReceivablePremium(orderNos);
+            if(CollUtil.isNotEmpty(orderNos)){
+                totalReceivablePremium = receivableService.queryAllTotalReceivablePremium(orderNos);
+            }
             totalReceivablePremium = totalReceivablePremium.setScale(5, RoundingMode.HALF_DOWN);
         }catch (Exception e){
             log.error("统计总的应收异常",e);

+ 1 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -2596,6 +2596,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         updateIncome.setJqOtherCostsPremiums(BigDecimalUtil.toString(jqOtherPremium));
         updateIncome.setSyOtherCostsPremiums(BigDecimalUtil.toString(syOtherPremium));
         updateIncome.setJyOtherCostsPremiums(BigDecimalUtil.toString(jyOtherPremium));
+        log.info("根据比例计算得到的金额:updateIncome=[{}]", JSONUtil.toJsonStr(updateIncome));
 
     }