diff --git a/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java b/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java
index e97a57a..57f72ee 100644
--- a/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java
+++ b/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java
@@ -579,7 +579,7 @@ public class IeComplaintsService {
// PENDING = PENDING + COMPLETED
sql.append("COUNT(DISTINCT CASE ");
- sql.append("WHEN cd.status IN ('pending','completed') ");
+ sql.append("WHEN cd.status IN ('pending') ");
if (fromDate != null && !fromDate.isEmpty()
&& toDate != null && !toDate.isEmpty()) {
@@ -589,7 +589,21 @@ public class IeComplaintsService {
params.add(toDate);
}
- sql.append("THEN cd.ref_id END) AS pending_count ");
+ sql.append("THEN cd.ref_id END) AS vendor_pending_count, ");
+
+ // IE PENDING
+ sql.append("COUNT(DISTINCT CASE ");
+ sql.append("WHEN cd.status IN ('completed') ");
+
+ if (fromDate != null && !fromDate.isEmpty()
+ && toDate != null && !toDate.isEmpty()) {
+
+ sql.append("AND DATE(cd.cdate) BETWEEN ? AND ? ");
+ params.add(fromDate);
+ params.add(toDate);
+ }
+
+ sql.append("THEN cd.ref_id END) AS ie_pending_count ");
sql.append("FROM gcc_street_vendor.zone_master zm ");
@@ -1246,9 +1260,9 @@ public class IeComplaintsService {
sql.append("THEN cd.ref_id END) AS completed_count, ");
- // PENDING = PENDING + COMPLETED
+ // PENDING = PENDING
sql.append("COUNT(DISTINCT CASE ");
- sql.append("WHEN cd.status IN ('pending','completed') ");
+ sql.append("WHEN cd.status IN ('pending') ");
if (fromDate != null && !fromDate.isEmpty()
&& toDate != null && !toDate.isEmpty()) {
@@ -1258,7 +1272,20 @@ public class IeComplaintsService {
params.add(toDate);
}
- sql.append("THEN cd.ref_id END) AS pending_count ");
+ sql.append("THEN cd.ref_id END) AS pending_count, ");
+
+ sql.append("COUNT(DISTINCT CASE ");
+ sql.append("WHEN cd.status IN ('completed') ");
+
+ if (fromDate != null && !fromDate.isEmpty()
+ && toDate != null && !toDate.isEmpty()) {
+
+ sql.append("AND DATE(cd.cdate) BETWEEN ? AND ? ");
+ params.add(fromDate);
+ params.add(toDate);
+ }
+
+ sql.append("THEN cd.ref_id END) AS ie_pending_count ");
sql.append("FROM complaint_master cm ");
diff --git a/src/main/java/com/gcc/commissionerreview/service/TenementService.java b/src/main/java/com/gcc/commissionerreview/service/TenementService.java
index f8de61d..9762a90 100644
--- a/src/main/java/com/gcc/commissionerreview/service/TenementService.java
+++ b/src/main/java/com/gcc/commissionerreview/service/TenementService.java
@@ -72,10 +72,15 @@ public class TenementService {
"WHEN final_status = 'verified' " +
"THEN 1 END) AS completed_count, " +
- // PENDING = CREATED + COMPLETED
+ // PENDING = CREATED
"COUNT(CASE " +
- "WHEN final_status IN ('created','completed') " +
- "THEN 1 END) AS pending_count " +
+ "WHEN final_status IN ('created') " +
+ "THEN 1 END) AS pending_count, " +
+
+ // completed
+ "COUNT(CASE " +
+ "WHEN final_status IN ('completed') " +
+ "THEN 1 END) AS ie_pending_count " +
"FROM issue_list1";
@@ -226,9 +231,15 @@ public class TenementService {
// PENDING = CREATED + COMPLETED
"COUNT(DISTINCT CASE " +
- "WHEN il1.final_status IN ('created','completed') " +
+ "WHEN il1.final_status IN ('created') " +
"THEN il1.id END) " +
- "AS total_complaint_pending_count " +
+ "AS total_complaint_pending_count, " +
+
+ // IE PENDING = CREATED + COMPLETED
+ "COUNT(DISTINCT CASE " +
+ "WHEN il1.final_status IN ('completed') " +
+ "THEN il1.id END) " +
+ "AS total_complaint_ie_pending_count " +
"FROM asset_master am " +
diff --git a/src/main/resources/templates/modules/vendorreport.html b/src/main/resources/templates/modules/vendorreport.html
index 6a20cbe..f61c2b9 100644
--- a/src/main/resources/templates/modules/vendorreport.html
+++ b/src/main/resources/templates/modules/vendorreport.html
@@ -12,6 +12,169 @@