From 41d34c5a8c0657d2c9396189138fd001b0b136f5 Mon Sep 17 00:00:00 2001 From: snehal-eGov <94351369+snehal-eGov@users.noreply.github.com> Date: Fri, 17 Feb 2023 10:48:17 +0530 Subject: [PATCH 1/5] Update WSCalculatorQueryBuilder.java --- .../repository/builder/WSCalculatorQueryBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/repository/builder/WSCalculatorQueryBuilder.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/repository/builder/WSCalculatorQueryBuilder.java index 476db7821..7b59b50da 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/repository/builder/WSCalculatorQueryBuilder.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/repository/builder/WSCalculatorQueryBuilder.java @@ -246,7 +246,7 @@ public String previousBillingCycleDemandQuery(Set connectionNos, String preparedStmtList.add(tenantId); } if(!CollectionUtils.isEmpty(preparedStmtList)) - builder.append("and status not IN ('CANCELLED')"); + builder.append("and status not IN ('CANCELLED') and tenantid<>'pb.testing'"); System.out.println("Final query ::" + builder.toString()); return builder.toString(); From 45e4557540d61af7a0dcd8b826672cc8e5d8c177 Mon Sep 17 00:00:00 2001 From: snehal-eGov <94351369+snehal-eGov@users.noreply.github.com> Date: Fri, 17 Feb 2023 13:50:15 +0530 Subject: [PATCH 2/5] Update application.properties --- .../ws-calculator/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/resources/application.properties b/municipal-services/ws-calculator/src/main/resources/application.properties index 482d7551a..ddac4df29 100644 --- a/municipal-services/ws-calculator/src/main/resources/application.properties +++ b/municipal-services/ws-calculator/src/main/resources/application.properties @@ -130,7 +130,7 @@ egov.sms.bill.download.link=mgramseva/withoutAuth/mgramseva-common?mode=pay&cons #Bulk Demand topics -egov.generate.bulk.demand.manually.topic=wscalc-demand-generation +egov.generate.bulk.demand.manually.topic=wscalculation-demand-generation egov.wscal.bulk.demand.schedular.topic=wscalc-bulkdemand-schedular egov.bulk.demand.msg.topic=wscal-bulkdemand-message From b49f2690278a3c6027b4624aa5bd332765f8f414 Mon Sep 17 00:00:00 2001 From: snehal-eGov <94351369+snehal-eGov@users.noreply.github.com> Date: Tue, 21 Feb 2023 16:27:48 +0530 Subject: [PATCH 3/5] Update application.properties --- .../ws-services/src/main/resources/application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/municipal-services/ws-services/src/main/resources/application.properties b/municipal-services/ws-services/src/main/resources/application.properties index d46c5329b..f22951bca 100644 --- a/municipal-services/ws-services/src/main/resources/application.properties +++ b/municipal-services/ws-services/src/main/resources/application.properties @@ -191,5 +191,6 @@ egov.es.search.endpoint=/_search egov.waterservice.es.index=water-services egov.ws.search.name.fuziness=2 +egov.ws.search.tenantId.fuziness=2 egov.ws.search.mobileNo.fuziness=2 egov.ws.fuzzy.searh.is.wildcard=true From 3d647b724c7a11ecea410d360261f6080d9204f3 Mon Sep 17 00:00:00 2001 From: snehal-eGov <94351369+snehal-eGov@users.noreply.github.com> Date: Tue, 21 Feb 2023 16:44:10 +0530 Subject: [PATCH 4/5] Update application.properties --- .../ws-services/src/main/resources/application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/municipal-services/ws-services/src/main/resources/application.properties b/municipal-services/ws-services/src/main/resources/application.properties index f22951bca..16a98cae4 100644 --- a/municipal-services/ws-services/src/main/resources/application.properties +++ b/municipal-services/ws-services/src/main/resources/application.properties @@ -194,3 +194,4 @@ egov.ws.search.name.fuziness=2 egov.ws.search.tenantId.fuziness=2 egov.ws.search.mobileNo.fuziness=2 egov.ws.fuzzy.searh.is.wildcard=true + From e89c81ebf6581bf62ecd746e836a2b9d8a630c2c Mon Sep 17 00:00:00 2001 From: Ramkrishna-egov Date: Tue, 21 Feb 2023 19:04:52 +0530 Subject: [PATCH 5/5] Version 1.2.3 --- frontend/mgramseva/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/mgramseva/pubspec.yaml b/frontend/mgramseva/pubspec.yaml index a51989a8f..283d27209 100644 --- a/frontend/mgramseva/pubspec.yaml +++ b/frontend/mgramseva/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.2.2+20 +version: 1.2.3+21 environment: sdk: ">=2.12.0 <3.0.0"