|
@@ -7,7 +7,6 @@ import com.zjugis.business.bean.request.FinanceCostRequest;
|
|
|
import com.zjugis.business.constants.DictConstants;
|
|
|
import com.zjugis.business.converter.common.SelectConvert;
|
|
|
import com.zjugis.business.converter.travelcost.TravelCostConvert;
|
|
|
-import com.zjugis.business.flow.commoncost.entity.CommonCostDetailDO;
|
|
|
import com.zjugis.business.flow.travelcost.controller.vo.TravelCostOverviewVO;
|
|
|
import com.zjugis.business.flow.travelcost.controller.vo.TravelCostPageReqVO;
|
|
|
import com.zjugis.business.flow.travelcost.controller.vo.TravelCostRespVO;
|
|
@@ -273,7 +272,8 @@ public class TravelCostServiceImpl implements TravelCostService {
|
|
|
List<TravelCostDO> list = stringListEntry.getValue();
|
|
|
BigDecimal totalAmount = BigDecimal.ZERO;
|
|
|
for (TravelCostDO travelCostDO : list) {
|
|
|
- totalAmount.add(travelCostDO.getTotalAmount());
|
|
|
+ BigDecimal amount = travelCostDO.getTotalAmount();
|
|
|
+ totalAmount.add(amount == null? BigDecimal.ZERO:amount);
|
|
|
}
|
|
|
result.put(projectId, totalAmount);
|
|
|
}
|