Commit 035b08d0 by jianshuqin

导出增加借支单明细

parent 1d20b55f
...@@ -192,7 +192,7 @@ public class CostExportServiceImpl implements CostExportService { ...@@ -192,7 +192,7 @@ public class CostExportServiceImpl implements CostExportService {
exportList = new ArrayList<>(); exportList = new ArrayList<>();
for (String costNo : exportNos) { for (String costNo : exportNos) {
CostDto costDtoByNo = costService.getCostByCostNo(costNo).castToDto(); CostDto costDtoByNo = costService.getCostByCostNo(costNo).castToDto();
if (1 == costDtoByNo.getCostForm()) { if (1 == costDtoByNo.getCostForm() || (3 == costDtoByNo.getCostForm() && 1 == costDtoByNo.getIsLend())) {
// 付款单,将子项目赋值到 CostDto 逐一打印 // 付款单,将子项目赋值到 CostDto 逐一打印
List<CostDetailDomain> costDetailDomains = costDetailDao.selectListByCostNo(costNo); List<CostDetailDomain> costDetailDomains = costDetailDao.selectListByCostNo(costNo);
if (null != costDetailDomains && costDetailDomains.size() >= 1) { if (null != costDetailDomains && costDetailDomains.size() >= 1) {
...@@ -206,6 +206,9 @@ public class CostExportServiceImpl implements CostExportService { ...@@ -206,6 +206,9 @@ public class CostExportServiceImpl implements CostExportService {
} }
exportList.add(cost); exportList.add(cost);
} }
} else if (3 == costDtoByNo.getCostForm() && 1 == costDtoByNo.getIsLend()) {
costDtoByNo.setAmountDto("" + costDtoByNo.getAmount().setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
exportList.add(costDtoByNo);
} }
} else { } else {
costDtoByNo.setAmountDto("" + costDtoByNo.getAmount().setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); costDtoByNo.setAmountDto("" + costDtoByNo.getAmount().setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment