Merge pull request #987 from egovernments/Taniya-createdDateIssue

Created date issue
egovernments · Oct 25, 2024 · 51a8bfb · 51a8bfb
2 parents f69c34f + 77b818d
commit 51a8bfb
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/business-services/billing-service/src/main/java/org/egov/demand/service/DemandService.java b/business-services/billing-service/src/main/java/org/egov/demand/service/DemandService.java
@@ -250,12 +250,13 @@ public DemandResponse updateAsync(DemandRequest demandRequest, PaymentBackUpdate
 				 */
 				newDemands.add(demand);
 			} else {
-				AuditDetails currAuditDetails = demand.getAuditDetails();
-				if (currAuditDetails != null) {
-					auditDetail.setCreatedTime(currAuditDetails.getCreatedTime());
-					auditDetail.setCreatedBy(currAuditDetails.getCreatedBy());
+				AuditDetails updateAuditDetail = util.getAuditDetail(requestInfo);
+				AuditDetails demandAuditDetails = demand.getAuditDetails();
+				if (demandAuditDetails != null) {
+					updateAuditDetail.setCreatedTime(demandAuditDetails.getCreatedTime());
+					updateAuditDetail.setCreatedBy(demandAuditDetails.getCreatedBy());
 				}
-				demand.setAuditDetails(auditDetail);
+				demand.setAuditDetails(updateAuditDetail);
 				for (DemandDetail detail : demand.getDemandDetails()) {
 
 					if (StringUtils.isEmpty(detail.getId())) {
@@ -265,7 +266,13 @@ public DemandResponse updateAsync(DemandRequest demandRequest, PaymentBackUpdate
 						detail.setId(UUID.randomUUID().toString());
 						detail.setCollectionAmount(BigDecimal.ZERO);
 					}
-					detail.setAuditDetails(auditDetail);
+					AuditDetails demandDetailAuditDetail = detail.getAuditDetails();
+					if (demandDetailAuditDetail != null) {
+						updateAuditDetail.setCreatedTime(demandDetailAuditDetail.getCreatedTime());
+						updateAuditDetail.setCreatedBy(demandDetailAuditDetail.getCreatedBy());
+					}
+
+					detail.setAuditDetails(updateAuditDetail);
 					detail.setDemandId(demandId);
 					detail.setTenantId(demand.getTenantId());
 				}