diff --git a/municipal-services/echallan-services/src/main/java/org/egov/echallan/repository/ChallanRepository.java b/municipal-services/echallan-services/src/main/java/org/egov/echallan/repository/ChallanRepository.java index 049eb49d6..420be7d3b 100644 --- a/municipal-services/echallan-services/src/main/java/org/egov/echallan/repository/ChallanRepository.java +++ b/municipal-services/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/municipal-services/echallan-services/src/main/java/org/egov/echallan/repository/builder/ChallanQueryBuilder.java b/municipal-services/echallan-services/src/main/java/org/egov/echallan/repository/builder/ChallanQueryBuilder.java index 36f19a550..d3735c0f7 100644 --- a/municipal-services/echallan-services/src/main/java/org/egov/echallan/repository/builder/ChallanQueryBuilder.java +++ b/municipal-services/echallan-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";