From f25d24939c3a03205ec27a3ff2dcc734ef69e8e0 Mon Sep 17 00:00:00 2001 From: saumya-egov <74046603+saumya-egov@users.noreply.github.com> Date: Wed, 20 Oct 2021 11:28:26 +0530 Subject: [PATCH 1/6] adding inbox searcher for tl --- configs/egov-searcher/inboxTLSearch.yml | 169 ++++++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 configs/egov-searcher/inboxTLSearch.yml diff --git a/configs/egov-searcher/inboxTLSearch.yml b/configs/egov-searcher/inboxTLSearch.yml new file mode 100644 index 00000000..c842636f --- /dev/null +++ b/configs/egov-searcher/inboxTLSearch.yml @@ -0,0 +1,169 @@ +SearchDefinitions: + moduleName: tl-services + summary: Trade License Services Inbox API + version: 1.0.0 + definitions: + - name: inboxtlsearch + query: + baseQuery: Select row_to_json(result) from + ( + select DISTINCT(tl.applicationNumber) as applicationnumber,tl.applicationdate as createdtime from eg_tl_tradelicense as tl + INNER JOIN eg_tl_tradelicensedetail tld ON tl.id = tld.tradelicenseid + INNER JOIN eg_tl_owner owner ON tld.id = owner.tradelicensedetailid + INNER JOIN eg_tl_address tladd ON tladd.tradelicensedetailid = tld.id + INNER JOIN eg_wf_processinstance_v2 pi ON pi.businessid = tl.applicationNumber + LEFT JOIN eg_wf_assignee_v2 assg ON pi.id = assg.processinstanceid + $where + AND pi.createdtime IN (select max(createdtime) from eg_wf_processinstance_v2 wf where wf.businessid = tl.applicationNumber GROUP BY wf.businessid) + order by tl.applicationdate asc $pagination + ) result + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tl.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: tl.licenseNumber + isMandatory: false + jsonPath: $.searchCriteria.licenseNumber + - name: tl.oldlicensenumber + isMandatory: false + jsonPath: $.searchCriteria.oldlicensenumber + - name: tladd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: assg.assignee + isMandatory: false + jsonPath: $.searchCriteria.assignee + - name: pi.status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: tl.applicationNumber + isMandatory: false + jsonPath: $.searchCriteria.applicationNumber + - name: owner.id + isMandatory: false + jsonPath: $.searchCriteria.userid + - name: pi.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businessservice + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {},"Licenses": []} + outJsonPath: $.Licenses + responseInfoPath: $.ResponseInfo + + - name: inboxtlsearchcount + query: + baseQuery: SELECT row_to_json(TotalCount) from (SELECT COUNT(result) from + ( + select DISTINCT(tl.applicationNumber) as applicationnumber,tl.applicationdate as createdtime from eg_tl_tradelicense as tl + INNER JOIN eg_tl_tradelicensedetail tld ON tl.id = tld.tradelicenseid + INNER JOIN eg_tl_owner owner ON tld.id = owner.tradelicensedetailid + INNER JOIN eg_tl_address tladd ON tladd.tradelicensedetailid = tld.id + INNER JOIN eg_wf_processinstance_v2 pi ON pi.businessid = tl.applicationNumber + LEFT JOIN eg_wf_assignee_v2 assg ON pi.id = assg.processinstanceid + $where + AND pi.createdtime IN (select max(createdtime) from eg_wf_processinstance_v2 wf where wf.businessid = tl.applicationNumber GROUP BY wf.businessid) + order by tl.applicationdate asc + ) result) TotalCount + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tl.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: tl.licenseNumber + isMandatory: false + jsonPath: $.searchCriteria.licenseNumber + - name: tl.oldlicensenumber + isMandatory: false + jsonPath: $.searchCriteria.oldlicensenumber + - name: tladd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: assg.assignee + isMandatory: false + jsonPath: $.searchCriteria.assignee + - name: pi.status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: tl.applicationNumber + isMandatory: false + jsonPath: $.searchCriteria.applicationNumber + - name: owner.id + isMandatory: false + jsonPath: $.searchCriteria.userid + - name: pi.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businessservice + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {},"TotalCount": {}} + outJsonPath: $.TotalCount + responseInfoPath: $.ResponseInfo + + - name: inboxtlsearchdesc + query: + baseQuery: Select row_to_json(result) from + ( + select DISTINCT(tl.applicationNumber) as applicationnumber,tl.applicationdate as createdtime from eg_tl_tradelicense as tl + INNER JOIN eg_tl_tradelicensedetail tld ON tl.id = tld.tradelicenseid + INNER JOIN eg_tl_owner owner ON tld.id = owner.tradelicensedetailid + INNER JOIN eg_tl_address tladd ON tladd.tradelicensedetailid = tld.id + INNER JOIN eg_wf_processinstance_v2 pi ON pi.businessid = tl.applicationNumber + LEFT JOIN eg_wf_assignee_v2 assg ON pi.id = assg.processinstanceid + $where + AND pi.createdtime IN (select max(createdtime) from eg_wf_processinstance_v2 wf where wf.businessid = tl.applicationNumber GROUP BY wf.businessid) + order by tl.applicationdate desc $pagination + ) result + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tl.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: tl.licenseNumber + isMandatory: false + jsonPath: $.searchCriteria.licenseNumber + - name: tl.oldlicensenumber + isMandatory: false + jsonPath: $.searchCriteria.oldlicensenumber + - name: tladd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: assg.assignee + isMandatory: false + jsonPath: $.searchCriteria.assignee + - name: pi.status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: tl.applicationNumber + isMandatory: false + jsonPath: $.searchCriteria.applicationNumber + - name: owner.id + isMandatory: false + jsonPath: $.searchCriteria.userid + - name: pi.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businessservice + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {},"Licenses": []} + outJsonPath: $.Licenses + responseInfoPath: $.ResponseInfo From 6b1dcfa77e0d674df4373b62d2b2b5c6b73b6cbf Mon Sep 17 00:00:00 2001 From: Suman467 <72135616+Suman467@users.noreply.github.com> Date: Thu, 21 Oct 2021 10:50:27 +0530 Subject: [PATCH 2/6] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 08068961..5561f279 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -96,7 +96,7 @@ ReportDefinitions: - name: paymentMode label: Payment Mode type: singlevaluelist - pattern: 'list://CASH:CASH,Online:Online,CARD:CARD,DD:DD,CHEQUE:CHEQUE' + pattern: 'list://CASH:CASH,Online:Online,CARD:CARD,DD:DD,CHEQUE:CHEQUE,POS:POS,NEFT:NEFT,RTGS:RTGS' source: pt isMandatory: false searchClause: AND paymentmode = $paymentMode @@ -246,7 +246,7 @@ ReportDefinitions: - name: paymentMode label: Payment Mode type: singlevaluelist - pattern: 'list://CASH:CASH,Online:Online,CARD:CARD,DD:DD,CHEQUE:CHEQUE' + pattern: 'list://CASH:CASH,Online:Online,CARD:CARD,DD:DD,CHEQUE:CHEQUE,POS:POS,NEFT:NEFT,RTGS:RTGS' source: pt isMandatory: false searchClause: AND paymentmode = $paymentMode From 77e2e17cbab1f9386446bc657114d982d1e96b58 Mon Sep 17 00:00:00 2001 From: guruprasadreddy-wt-egov <61416461+guruprasadreddy-wt-egov@users.noreply.github.com> Date: Wed, 1 Dec 2021 14:24:11 +0530 Subject: [PATCH 3/6] Created tlcertificate.json Created tlcertificate.json --- .../data-config/tlcertificate.json | 443 ++++++++++++++++++ 1 file changed, 443 insertions(+) create mode 100644 configs/pdf-service/data-config/tlcertificate.json diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json new file mode 100644 index 00000000..47a87515 --- /dev/null +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -0,0 +1,443 @@ +{ + "key": "tlcertificate", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Licenses.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/logo.png", + "type":"image" + }, + { + "variable": "tradeLicenseNo", + "value": { + "path": "$.licenseNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNumber" + } + }, + { + "variable": "financialYear", + "value": { + "path": "$.financialYear" + } + }, + { + "variable": "tradeName", + "value": { + "path": "$.tradeName" + } + }, + { + "variable": "tradeOwnerName", + "value": { + "path": "$.tradeLicenseDetail.owners[0].name" + } + }, + { + "variable": "tradeOwnerContact", + "value": { + "path": "$.tradeLicenseDetail.owners[0].mobileNumber" + } + }, + { + "variable": "tradeAddress", + "value": { + "path": "$.tradeLicenseDetail.address.locality.name" + } + }, + { + "variable": "city", + "value": { + "path": "$.tradeLicenseDetail.address.city" + }, + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "tradeType", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessories", + "value": { + "path": "$.tradeLicenseDetail.accessories[0].accessoryCategory" + }, + "localisation":{ + "required":true, + "prefix": "TL", + "module": "rainmaker-tl" + } + }, + { + "variable": "licenseIssueDate", + "value": { + "path": "$.issuedDate" + }, + "type": "date" + }, + { + "variable": "licenseValidityFrom", + "value": { + "path": "$.validFrom" + }, + "type": "date" + }, + { + "variable": "licenseValidityTo", + "value": { + "path": "$.validTo" + }, + "type": "date" + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "municipal_corportaion", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_website", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_WEBSITE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_email", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_EMAIL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_certifcate", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CERTIFICATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "reciept_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RECIEPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "financial_year", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_FINANCIAL_YEAR" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessories_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_ACCESSORIES_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_fee", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_LICENSE_FEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_validity", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_VALIDITY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pg&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"ulb-address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"corporationContact", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"corporationWebsite", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"corporationEmail", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + } + ] + }, + { + "path": "http://collection-services:8080/collection-services/payments/_search", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNumber,businessServices=TL", + "apiRequest": null, + "responseMapping":[ + { + "variable":"tradeLicenseFee", + "value":"$.Payments[0].totalDue" + }, + { + "variable":"recieptNo", + "value":"$.Payments[0].paymentDetails[0].receiptNumber" + } + + ] + }, + { + "path": "http://egov-filestore:8080/filestore/v1/files/url", + "queryParam": "tenantId=pg,fileStoreIds=$.tradeLicenseDetail.applicationDocuments[?(@.documentType== 'OWNERPHOTO')].fileStoreId", + "apiRequest": null, + "requesttype": "GET", + "responseMapping":[ + { + "variable":"userpic", + "value":"$.fileStoreIds[0].url", + "type": "image" + } + ] + }, + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "businessIds=$.applicationNumber,history=true,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping":[ + { + "variable":"approvedBy", + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + } + + ] + } + + ] + } + ] + +} +] +} +} From b404bf9e44ed61943fad1876571e855fd8f1b1e7 Mon Sep 17 00:00:00 2001 From: shreyaraghunandan-eGov <68096777+shreyaraghunandan-eGov@users.noreply.github.com> Date: Fri, 17 Dec 2021 10:28:09 +0530 Subject: [PATCH 4/6] Update consolidatedreceipt.json --- configs/pdf-service/format-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index aae7d26f..061c92e1 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -80,7 +80,7 @@ ] ] }, - "layout": "{}" + "layout": {} }, { "style": "receiptapprover", From 6683aaf4156d805098d216ea946fe1097acf391a Mon Sep 17 00:00:00 2001 From: shreyaraghunandan-eGov <68096777+shreyaraghunandan-eGov@users.noreply.github.com> Date: Tue, 18 Jan 2022 16:51:58 +0530 Subject: [PATCH 5/6] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 6eda5b2b..0888cc23 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -817,6 +817,6 @@ ReportDefinitions: from egcl_payment py JOIN egcl_paymentdetail AS rh ON py.id=rh.paymentid JOIN egcl_bill as bi ON bi.id=rh.billid JOIN eg_user ON py.createdby::INTEGER=eg_user.id - where bi.status != 'CANCELLED' AND bi.consumercode LIKE '%UC% + where bi.status != 'CANCELLED' AND bi.consumercode LIKE '%UC%' AND rh.tenantid=$tenantid AND rh.tenantid != 'uk.testing' orderby: ORDER BY rh.receiptdate DESC; From 5f9b2c8f1033c8fed81bc93f5677d0b534c68812 Mon Sep 17 00:00:00 2001 From: Hemanth K <49431024+khemanth-eGov@users.noreply.github.com> Date: Fri, 21 Jan 2022 10:07:34 +0530 Subject: [PATCH 6/6] Added unit active condition for the arv count --- .../org/egov/ukdcustomservice/service/DcbRefreshService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukd-custom-service/src/main/java/org/egov/ukdcustomservice/service/DcbRefreshService.java b/ukd-custom-service/src/main/java/org/egov/ukdcustomservice/service/DcbRefreshService.java index b187f354..68547d55 100644 --- a/ukd-custom-service/src/main/java/org/egov/ukdcustomservice/service/DcbRefreshService.java +++ b/ukd-custom-service/src/main/java/org/egov/ukdcustomservice/service/DcbRefreshService.java @@ -69,7 +69,7 @@ public boolean refresh(String tenant) " ( "+ " SELECT sum(unit.arv)"+ " FROM eg_pt_unit unit "+ - " WHERE unit.propertyid=prop.id),0) currentarv,"+ + " WHERE unit.propertyid=prop.id and unit.active = 't'),0) currentarv,"+ " COALESCE("+ " ("+ " "+