Merge pull request #700 from egovernments/PFM-4114-New

PFM 4114
egovernments · Jan 19, 2024 · 30a0e5f · 30a0e5f
2 parents d6fb7a7 + b0b7202
commit 30a0e5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/...vices/echallan-services/src/main/java/org/egov/echallan/repository/ChallanRepository.java b/...vices/echallan-services/src/main/java/org/egov/echallan/repository/ChallanRepository.java
@@ -110,12 +110,7 @@ public void save(ChallanRequest challanRequest) {
      * @param ChallanRequest The challan create request
      */
     public void update(ChallanRequest challanRequest) {
-
-    	if(challanRequest.getChallan().getPaidDate()!=null)
-		{
-			challanRequest.getChallan().setPaidDate(Long.valueOf(challanRequest.getChallan().getPaidDate()));
-		}
-		log.info("CHALLAN ISBILLPAID:"+challanRequest.getChallan().getIsBillPaid()  +" | PAID DATE: "+challanRequest.getChallan().getPaidDate());
+		log.info("CHALLAN ISBILLPAID:"+challanRequest.getChallan().getIsBillPaid()  +" | PAID DATE: "+challanRequest.getChallan().getPaidDate()+" | STATUS: "+challanRequest.getChallan().getApplicationStatus());
 		producer.push(config.getUpdateChallanTopic(), challanRequest);
     }
 

diff --git a/...llan-services/src/main/java/org/egov/echallan/repository/builder/ChallanQueryBuilder.java b/...llan-services/src/main/java/org/egov/echallan/repository/builder/ChallanQueryBuilder.java
@@ -45,7 +45,7 @@ public ChallanQueryBuilder(ChallanConfiguration config) {
 
       public static final String FILESTOREID_UPDATE_SQL = "UPDATE eg_echallan SET filestoreid=? WHERE id=?";
 
-      public static final String CANCEL_RECEIPT_UPDATE_SQL = "UPDATE eg_echallan SET applicationStatus='ACTIVE' WHERE referenceId=? and businessService=?";
+      public static final String CANCEL_RECEIPT_UPDATE_SQL = "UPDATE eg_echallan SET applicationStatus='CANCELLED' WHERE referenceId=? and businessService=?";
 
       private static final String TENANTIDS = "SELECT distinct(tenantid) FROM eg_echallan challan";