|
|
@@ -162,6 +162,8 @@ public class ConstructionManage { |
|
|
|
String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm"); |
|
|
|
exportDTO.setCreateOn(createOnStr); |
|
|
|
exportDTO.setSerialNumber(serialNumber.incrementAndGet()); |
|
|
|
exportDTO.setApprovedAmount(r.getApprovalAmount()); |
|
|
|
exportDTO.setApprovalDate(r.getApprovalDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); |
|
|
|
if(purchaseMap.containsKey(r.getId())){ |
|
|
|
Purchase purchase = purchaseMap.get(r.getId()); |
|
|
|
exportDTO.setTransactionAmount(purchase.getTransactionAmount()); |
|
|
|