Browse Source

合同信息相关bug修复

chenjun 6 months ago
parent
commit
03ec648178

+ 9 - 4
zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zjugis.business.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -308,13 +309,17 @@ public class ContractServiceImpl implements ContractService{
         resp.setSubToPay(subToPayDto.getSubToPay());
         resp.setOutToPay(subToPayDto.getOutToPay());
         ContractInfoResp cost =  projectAmountService.selectCostSum(projectAmountDto);
-        resp.setPaymentCost(cost.getPaymentCost());
-        resp.setReimbursementCost(cost.getReimbursementCost());
-        resp.setTravelCost(cost.getTravelCost());
+        if(ObjectUtil.isNotNull(cost)){
+            resp.setPaymentCost(cost.getPaymentCost());
+            resp.setReimbursementCost(cost.getReimbursementCost());
+            resp.setTravelCost(cost.getTravelCost());
+        }
         UseMoneyDeptRespVO paymentCost = useMoneyService.getDataByDeptId(new ArrayList<>(deptPermissions.getDeptIds()));
         BigDecimal commonCost = commonCostService.getPaymentCost(infoRequest.getYear(), deptPermissions.getDeptIds());
         BigDecimal travelCost = travelCostService.getTravelCost(infoRequest.getYear(), deptPermissions.getDeptIds());
-        resp.setPaymentCost(paymentCost.getAmount());
+        if(ObjectUtil.isNotNull(paymentCost)){
+            resp.setPaymentCost(paymentCost.getAmount());
+        }
         resp.setTravelCost(travelCost);
         resp.setReimbursementCost(commonCost);
         return resp;