From e0b772b9a38563c60843f2ba157406196d7870b0 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <118716448+rahuldevgarg-egov@users.noreply.github.com> Date: Mon, 3 Apr 2023 15:00:10 +0530 Subject: [PATCH 1/2] corrected toDate to include milliseconds too --- data/pb/BillingService/TaxPeriod.json | 58 +++++++++++++-------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/data/pb/BillingService/TaxPeriod.json b/data/pb/BillingService/TaxPeriod.json index 8505c7341d..950f940405 100644 --- a/data/pb/BillingService/TaxPeriod.json +++ b/data/pb/BillingService/TaxPeriod.json @@ -88,35 +88,35 @@ }, { "fromDate": 1648751400000, - "toDate": 1680244199000, + "toDate": 1680244199999, "periodCycle": "ANNUAL", "service": "EXPENSE.ELECTRICITY_BILL", "code": "EXPENSEELECTRICITY_BILL", "financialYear": "2022-23" },{ "fromDate": 1648751400000, - "toDate": 1680244199000, + "toDate": 1680244199999, "periodCycle": "ANNUAL", "service": "EXPENSE.SALARY", "code": "EXPENSESALARY", "financialYear": "2022-23" },{ "fromDate": 1648751400000, - "toDate": 1680244199000, + "toDate": 1680244199999, "periodCycle": "ANNUAL", "service": "EXPENSE.MACHINERY_REPAIR", "code": "EXPENSEMACHINERYREPAIR", "financialYear": "2022-23" },{ "fromDate": 1648751400000, - "toDate": 1680244199000, + "toDate": 1680244199999, "periodCycle": "ANNUAL", "service": "EXPENSE.OTHERS", "code": "EXPENSEOTHERS", "financialYear": "2022-23" },{ "fromDate": 1648751400000, - "toDate": 1680244199000, + "toDate": 1680244199999, "periodCycle": "TWOYEARS", "service": "WS", "code": "WC2022", @@ -124,7 +124,7 @@ }, { "fromDate": 1648751400000, - "toDate": 1680244199000, + "toDate": 1680244199999, "periodCycle": "TWOYEARS", "service": "EXPENSE.CHLORINATION", "code": "EXPENSECHLORINATION", @@ -132,7 +132,7 @@ }, { "fromDate": 1648751400000, - "toDate": 1680244199000, + "toDate": 1680244199999, "periodCycle": "TWOYEARS", "service": "EXPENSE.WATER_TREATMENT", "code": "EXPENSEWATERTREATMENT", @@ -140,7 +140,7 @@ }, { "fromDate": 1648751400000, - "toDate": 1680244199000, + "toDate": 1680244199999, "periodCycle": "TWOYEARS", "service": "EXPENSE.PIPELINE_REPAIR", "code": "EXPENSEPIPELINEREPAIR", @@ -148,7 +148,7 @@ }, { "fromDate": 1648751400000, - "toDate": 1680244199000, + "toDate": 1680244199999, "periodCycle": "TWOYEARS", "service": "EXPENSE.NEW_MACHINERY", "code": "EXPENSENEWMACHINERY", @@ -156,7 +156,7 @@ }, { "fromDate": 1648751400000, - "toDate": 1680244199000, + "toDate": 1680244199999, "periodCycle": "TWOYEARS", "service": "EXPENSE.NEW_PIPELINE", "code": "EXPENSENEWPIPELINE", @@ -164,7 +164,7 @@ }, { "fromDate": 1648751400000, - "toDate": 1680244199000, + "toDate": 1680244199999, "periodCycle": "TWOYEARS", "service": "EXPENSE.INCENTIVES", "code": "EXPENSEINCENTIVES", @@ -172,7 +172,7 @@ }, { "fromDate": 1680244199000, - "toDate": 1711866599000, + "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.ELECTRICITY_BILL", "code": "EXPENSEELECTRICITY_BILL", @@ -180,7 +180,7 @@ }, { "fromDate": 1680244199000, - "toDate": 1711866599000, + "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.SALARY", "code": "EXPENSESALARY", @@ -188,7 +188,7 @@ }, { "fromDate": 1680244199000, - "toDate": 1711866599000, + "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.MACHINERY_REPAIR", "code": "EXPENSEMACHINERYREPAIR", @@ -196,7 +196,7 @@ }, { "fromDate": 1680244199000, - "toDate": 1711866599000, + "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.OTHERS", "code": "EXPENSEOTHERS", @@ -204,56 +204,56 @@ }, { "fromDate": 1680244199000, - "toDate": 1711866599000, - "periodCycle": "TWOYEARS", + "toDate": 1711866599999, + "periodCycle": "ANNUAL", "service": "WS", "code": "WC2023", "financialYear": "2023-24" }, { "fromDate": 1680244199000, - "toDate": 1711866599000, - "periodCycle": "TWOYEARS", + "toDate": 1711866599999, + "periodCycle": "ANNUAL", "service": "EXPENSE.CHLORINATION", "code": "EXPENSECHLORINATION", "financialYear": "2023-24" }, { "fromDate": 1680244199000, - "toDate": 1711866599000, - "periodCycle": "TWOYEARS", + "toDate": 1711866599999, + "periodCycle": "ANNUAL", "service": "EXPENSE.WATER_TREATMENT", "code": "EXPENSEWATERTREATMENT", "financialYear": "2023-24" }, { "fromDate": 1680244199000, - "toDate": 1711866599000, - "periodCycle": "TWOYEARS", + "toDate": 1711866599999, + "periodCycle": "ANNUAL", "service": "EXPENSE.PIPELINE_REPAIR", "code": "EXPENSEPIPELINEREPAIR", "financialYear": "2023-24" }, { "fromDate": 1680244199000, - "toDate": 1711866599000, - "periodCycle": "TWOYEARS", + "toDate": 1711866599999, + "periodCycle": "ANNUAL", "service": "EXPENSE.NEW_MACHINERY", "code": "EXPENSENEWMACHINERY", "financialYear": "2023-24" }, { "fromDate": 1680244199000, - "toDate": 1711866599000, - "periodCycle": "TWOYEARS", + "toDate": 1711866599999, + "periodCycle": "ANNUAL", "service": "EXPENSE.NEW_PIPELINE", "code": "EXPENSENEWPIPELINE", "financialYear": "2023-24" }, { "fromDate": 1680244199000, - "toDate": 1711866599000, - "periodCycle": "TWOYEARS", + "toDate": 1711866599999, + "periodCycle": "ANNUAL", "service": "EXPENSE.INCENTIVES", "code": "EXPENSEINCENTIVES", "financialYear": "2023-24" From 35ca69b24abeaed67e6227a7ace4b3b7960b8eac Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <118716448+rahuldevgarg-egov@users.noreply.github.com> Date: Mon, 3 Apr 2023 15:18:29 +0530 Subject: [PATCH 2/2] corrected from date of 2023-24 --- data/pb/BillingService/TaxPeriod.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/pb/BillingService/TaxPeriod.json b/data/pb/BillingService/TaxPeriod.json index 950f940405..e0a0cecc2c 100644 --- a/data/pb/BillingService/TaxPeriod.json +++ b/data/pb/BillingService/TaxPeriod.json @@ -171,7 +171,7 @@ "financialYear": "2022-23" }, { - "fromDate": 1680244199000, + "fromDate": 1680287400000, "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.ELECTRICITY_BILL", @@ -179,7 +179,7 @@ "financialYear": "2023-24" }, { - "fromDate": 1680244199000, + "fromDate": 1680287400000, "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.SALARY", @@ -187,7 +187,7 @@ "financialYear": "2023-24" }, { - "fromDate": 1680244199000, + "fromDate": 1680287400000, "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.MACHINERY_REPAIR", @@ -195,7 +195,7 @@ "financialYear": "2023-24" }, { - "fromDate": 1680244199000, + "fromDate": 1680287400000, "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.OTHERS", @@ -203,7 +203,7 @@ "financialYear": "2023-24" }, { - "fromDate": 1680244199000, + "fromDate": 1680287400000, "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "WS", @@ -211,7 +211,7 @@ "financialYear": "2023-24" }, { - "fromDate": 1680244199000, + "fromDate": 1680287400000, "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.CHLORINATION", @@ -219,7 +219,7 @@ "financialYear": "2023-24" }, { - "fromDate": 1680244199000, + "fromDate": 1680287400000, "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.WATER_TREATMENT", @@ -227,7 +227,7 @@ "financialYear": "2023-24" }, { - "fromDate": 1680244199000, + "fromDate": 1680287400000, "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.PIPELINE_REPAIR", @@ -235,7 +235,7 @@ "financialYear": "2023-24" }, { - "fromDate": 1680244199000, + "fromDate": 1680287400000, "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.NEW_MACHINERY", @@ -243,7 +243,7 @@ "financialYear": "2023-24" }, { - "fromDate": 1680244199000, + "fromDate": 1680287400000, "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.NEW_PIPELINE", @@ -251,7 +251,7 @@ "financialYear": "2023-24" }, { - "fromDate": 1680244199000, + "fromDate": 1680287400000, "toDate": 1711866599999, "periodCycle": "ANNUAL", "service": "EXPENSE.INCENTIVES",