From 6fc829696fda24db0858e4b70ebf62188d59618d Mon Sep 17 00:00:00 2001
From: yoganandhan <yogalinking@gmail.com>
Date: Wed, 11 Feb 2026 16:05:44 +0530
Subject: [PATCH] for permanent flagpole or statue updated service, message
 content and pages

---
 .../configuration/DataSourceConfig.java       |    9 +-
 .../configuration/WebMvcConfig.java           |    3 +-
 .../controller/FlagPoleApiController.java     |  297 +---
 .../flagpoles/controller/MainController.java  |    4 +-
 .../flagpoles/service/FlagpoleSMSService.java |   81 +
 .../flagpoles/service/RdoService.java         | 1346 +++++++++--------
 src/main/resources/application-dev.properties |    5 +-
 .../resources/application-prod.properties     |    4 +-
 .../modules/flagpole/adminreports.html        |  751 +++++++++
 .../flagpole/approvedandrejectedlist.html     |  110 +-
 .../modules/flagpole/requestlist.html         |  369 ++++-
 11 files changed, 2058 insertions(+), 921 deletions(-)
 create mode 100644 src/main/resources/templates/modules/flagpole/adminreports.html

diff --git a/src/main/java/com/gcc/flagpoles_services/configuration/DataSourceConfig.java b/src/main/java/com/gcc/flagpoles_services/configuration/DataSourceConfig.java
index 07469c8..867e4fb 100644
--- a/src/main/java/com/gcc/flagpoles_services/configuration/DataSourceConfig.java
+++ b/src/main/java/com/gcc/flagpoles_services/configuration/DataSourceConfig.java
@@ -23,12 +23,13 @@ import java.util.Properties;
 public class DataSourceConfig {
 
 	// local
-	// private static String host = "localhost:3306";
-	// private static String dbpassword = "root";
+	private static String host = "localhost:3306";
+	private static String dbpassword = "root";
 
 	// AWS
-	private static String host = "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306";
-	private static String dbpassword = "gcc-facial-password";
+	// private static String host =
+	// "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306";
+	// private static String dbpassword = "gcc-facial-password";
 
 	@Configuration
 	@EnableTransactionManagement
diff --git a/src/main/java/com/gcc/flagpoles_services/configuration/WebMvcConfig.java b/src/main/java/com/gcc/flagpoles_services/configuration/WebMvcConfig.java
index d22caee..ef82412 100644
--- a/src/main/java/com/gcc/flagpoles_services/configuration/WebMvcConfig.java
+++ b/src/main/java/com/gcc/flagpoles_services/configuration/WebMvcConfig.java
@@ -61,7 +61,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
                 appModuleRepository,
                 menuItemRepository,
                 subMenuItemRepository,
-                environment));
+                environment))
+                .excludePathPatterns("/assets/**", "/files/**", "/images/**", "/css/**", "/js/**", "/fonts/**");
     }
 
     @Override
diff --git a/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java b/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java
index c813574..1ba1c9c 100644
--- a/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java
+++ b/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java
@@ -36,97 +36,12 @@ public class FlagPoleApiController {
                 this.appConfig = appConfig;
         }
 
-        // new
-        // @GetMapping("/getAllDetails")
-        // public ResponseEntity<?> getAllRequestDetails(
-        // @RequestParam String userLogin,
-        // @RequestParam(required = false) String startDate,
-        // @RequestParam(required = false) String endDate) {
-
-        // try {
-        // List<Map<String, Object>> result =
-        // rdoService.getAllRequestDetailsByUserLogin(
-        // userLogin, startDate, endDate);
-
-        // // 🔥 Attach HISTORY per refid
-        // for (Map<String, Object> record : result) {
-        // String refid = (String) record.get("refid");
-
-        // // List<Map<String, Object>> history =
-        // // rdoService.getRequestHistoryByRefId(refid);
-        // List<Map<String, Object>> history =
-        // rdoService.getOfficerFeedbackHistoryByRefId(refid,
-        // userLogin);
-
-        // record.put("history", history);
-        // }
-
-        // return ResponseEntity.ok(
-        // Map.of(
-        // "status", "success",
-        // "count", result.size(),
-        // "data", result));
-
-        // } catch (Exception e) {
-        // e.printStackTrace();
-        // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-        // .body(Map.of(
-        // "status", "error",
-        // "message", "Failed to fetch data",
-        // "error", e.getMessage()));
-        // }
-        // }
-
-        // @GetMapping("/getAllDetails")
-        // public ResponseEntity<?> getAllRequestDetails(
-        // @RequestParam String gccUserId,
-        // @RequestParam(required = false) String startDate,
-        // @RequestParam(required = false) String endDate) {
-
-        // try {
-
-        // // 🔥 Resolve username ONCE (backend trust)
-        // String username = rdoService.getUsernameByUserId(gccUserId);
-        // if (username == null) {
-        // throw new RuntimeException("Invalid gccUserId : " + gccUserId);
-        // }
-
-        // List<Map<String, Object>> result =
-        // rdoService.getAllRequestDetailsByUserLogin(
-        // gccUserId, startDate, endDate);
-
-        // // 🔥 Attach HISTORY per refid (dept-wise)
-        // for (Map<String, Object> record : result) {
-        // String refid = (String) record.get("refid");
-
-        // List<Map<String, Object>> history =
-        // rdoService.getOfficerFeedbackHistoryByRefId(
-        // refid, username);
-
-        // record.put("history", history);
-        // }
-
-        // return ResponseEntity.ok(
-        // Map.of(
-        // "status", "success",
-        // "count", result.size(),
-        // "data", result));
-
-        // } catch (Exception e) {
-        // e.printStackTrace();
-        // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-        // .body(Map.of(
-        // "status", "error",
-        // "message", "Failed to fetch data",
-        // "error", e.getMessage()));
-        // }
-        // }
-
         @GetMapping("/getAllDetails")
         public ResponseEntity<?> getAllRequestDetails(
                         @RequestParam String gccUserId,
                         @RequestParam(required = false) String startDate,
-                        @RequestParam(required = false) String endDate) {
+                        @RequestParam(required = false) String endDate,
+                        @RequestParam(required = false) String applicationType) {
 
                 try {
 
@@ -134,7 +49,7 @@ public class FlagPoleApiController {
                         gccUserId = rdoService.resolveGccUserId(gccUserId);
 
                         List<Map<String, Object>> result = rdoService.getAllRequestDetailsByUserLogin(gccUserId,
-                                        startDate, endDate);
+                                        startDate, endDate, applicationType);
 
                         /* 🔥 Attach HISTORY per refid */
                         for (Map<String, Object> record : result) {
@@ -163,68 +78,14 @@ public class FlagPoleApiController {
                 }
         }
 
-        // old
-        // @PostMapping("/rdo/updateDecision")
-        // public ResponseEntity<?> updateRdoDecision(
-        // @RequestParam String refid,
-        // @RequestParam String status,
-        // @RequestParam String remarks,
-        // @RequestParam String approvedBy) {
-
-        // int count = rdoService.updateRdoDecision(refid, status, remarks, approvedBy);
-
-        // if (count > 0) {
-        // return ResponseEntity.ok(Map.of(
-        // "status", "SUCCESS",
-        // "message", "Decision updated successfully"));
-        // } else {
-        // return ResponseEntity.badRequest().body(Map.of(
-        // "status", "FAILED",
-        // "message", "Unable to update decision"));
-        // }
-        // }
-
-        // @PostMapping("/rdo/updateDecision")
-        // public ResponseEntity<?> updateRdoDecision(
-        // @RequestParam String refid,
-        // @RequestParam String status,
-        // @RequestParam String remarks,
-        // @RequestParam String gccUserId) {
-
-        // try {
-
-        // /* 🔥 Normalize username OR id → gccuserid */
-        // gccUserId = rdoService.resolveGccUserId(gccUserId);
-
-        // int count = rdoService.updateRdoDecision(
-        // refid, status, remarks, gccUserId);
-
-        // if (count > 0) {
-        // return ResponseEntity.ok(Map.of(
-        // "status", "SUCCESS",
-        // "message", "Decision updated successfully"));
-        // } else {
-        // return ResponseEntity.badRequest().body(Map.of(
-        // "status", "FAILED",
-        // "message", "Unable to update decision"));
-        // }
-
-        // } catch (Exception e) {
-        // e.printStackTrace();
-        // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-        // .body(Map.of(
-        // "status", "ERROR",
-        // "message", e.getMessage()));
-        // }
-        // }
-
         @PostMapping("/officer/updateDecision")
         public ResponseEntity<?> updateOfficerDecision(
                         @RequestParam String refid,
                         @RequestParam String status,
                         @RequestParam String remarks,
                         @RequestParam String gccUserId,
-                        @RequestParam String username) {
+                        @RequestParam String username,
+                        @RequestParam(required = false) String answers) {
 
                 try {
 
@@ -236,7 +97,8 @@ public class FlagPoleApiController {
                                         status,
                                         remarks,
                                         gccUserId,
-                                        username);
+                                        username,
+                                        answers);
 
                         if (count > 0) {
                                 return ResponseEntity.ok(Map.of(
@@ -257,112 +119,6 @@ public class FlagPoleApiController {
                 }
         }
 
-        // old
-        // @GetMapping("/getApprovedAndRejectedDetails")
-        // public ResponseEntity<?> getApprovedRequestDetails(
-        // @RequestParam String userLogin,
-        // @RequestParam(required = false) String startDate,
-        // @RequestParam(required = false) String endDate,
-        // @RequestParam(required = false) String status) {
-
-        // try {
-        // List<Map<String, Object>> result =
-        // rdoService.getRdoApprovedRequestDetailsByUserLogin(
-        // userLogin, startDate, endDate, status);
-
-        // return ResponseEntity.ok(
-        // Map.of(
-        // "status", "success",
-        // "count", result.size(),
-        // "data", result));
-
-        // } catch (Exception e) {
-        // e.printStackTrace();
-        // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-        // .body(
-        // Map.of(
-        // "status", "error",
-        // "message", "Failed to fetch data",
-        // "error", e.getMessage()));
-        // }
-        // }
-
-        // new
-        // @GetMapping("/getApprovedAndRejectedDetails")
-        // public ResponseEntity<?> getApprovedRequestDetails(
-        // @RequestParam String userLogin,
-        // @RequestParam(required = false) String startDate,
-        // @RequestParam(required = false) String endDate,
-        // @RequestParam(required = false) String status) {
-
-        // try {
-        // List<Map<String, Object>> result =
-        // rdoService.getRdoApprovedRequestDetailsByUserLogin(
-        // userLogin, startDate, endDate, status);
-
-        // // 🔥 Attach HISTORY per refid
-        // for (Map<String, Object> record : result) {
-        // String refid = (String) record.get("refid");
-
-        // List<Map<String, Object>> history =
-        // rdoService.getRequestHistoryByRefId(refid);
-
-        // record.put("history", history);
-        // }
-
-        // return ResponseEntity.ok(
-        // Map.of(
-        // "status", "success",
-        // "count", result.size(),
-        // "data", result));
-
-        // } catch (Exception e) {
-        // e.printStackTrace();
-        // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-        // .body(Map.of(
-        // "status", "error",
-        // "message", "Failed to fetch data",
-        // "error", e.getMessage()));
-        // }
-        // }
-
-        // @GetMapping("/getApprovedAndRejectedDetails")
-        // public ResponseEntity<?> getApprovedRequestDetails(
-        // @RequestParam String userLogin,
-        // @RequestParam(required = false) String startDate,
-        // @RequestParam(required = false) String endDate) {
-
-        // try {
-        // List<Map<String, Object>> result =
-        // rdoService.getRdoApprovedRequestDetailsByUserLogin(
-        // userLogin, startDate, endDate, null);
-
-        // for (Map<String, Object> record : result) {
-        // String refid = (String) record.get("refid");
-
-        // // 🔥 NEW: officer feedback history
-        // List<Map<String, Object>> history =
-        // rdoService.getOfficerFeedbackHistoryByRefId(refid,
-        // userLogin);
-
-        // record.put("history", history);
-        // }
-
-        // return ResponseEntity.ok(Map.of(
-        // "status", "success",
-        // "count", result.size(),
-        // "data", result));
-
-        // } catch (Exception e) {
-        // e.printStackTrace();
-        // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-        // .body(Map.of(
-        // "status", "error",
-        // "message", "Failed to fetch data",
-        // "error", e.getMessage()));
-        // }
-        // }
-
         @GetMapping("/getApprovedAndRejectedDetails")
         public ResponseEntity<?> getApprovedRequestDetails(
                         @RequestParam String gccUserId,
@@ -422,4 +178,43 @@ public class FlagPoleApiController {
                 return flagpoleSMSService.unauthorizedFlagPoleSms(mobileNo, location, fineAmount, refid);
         }
 
+        @GetMapping("/sendPermanentRequestApproved")
+        public String sendPermanentRequestApproved(@RequestParam String mobileNo, @RequestParam String requestId) {
+                return flagpoleSMSService.sendPermanentRequestApproved(mobileNo, requestId);
+        }
+
+        @GetMapping("/sendPermanentRequestRejected")
+        public String sendPermanentRequestRejected(@RequestParam String mobileNo, @RequestParam String requestId) {
+                return flagpoleSMSService.sendPermanentRequestRejected(mobileNo, requestId);
+        }
+
+        @GetMapping("/getAdminReports")
+        public ResponseEntity<?> getAdminReports(
+                        @RequestParam String gccUserId,
+                        @RequestParam(required = false) String startDate,
+                        @RequestParam(required = false) String endDate,
+                        @RequestParam(required = false) String status) {
+
+                try {
+                        /* 🔥 Normalize username OR id → gccuserid */
+                        gccUserId = rdoService.resolveGccUserId(gccUserId);
+
+                        List<Map<String, Object>> result = rdoService.getAdminReportDetails(gccUserId, startDate,
+                                        endDate, status);
+
+                        return ResponseEntity.ok(Map.of(
+                                        "status", "success",
+                                        "count", result.size(),
+                                        "data", result));
+
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                                        .body(Map.of(
+                                                        "status", "error",
+                                                        "message", "Failed to fetch admin report data",
+                                                        "error", e.getMessage()));
+                }
+        }
+
 }
diff --git a/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/MainController.java b/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/MainController.java
index b52886b..5cdff67 100644
--- a/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/MainController.java
+++ b/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/MainController.java
@@ -38,7 +38,7 @@ public class MainController {
         return "modules/flagpole/approvedandrejectedlist";
     }
 
-    @GetMapping("/reports")
+    @GetMapping("/adminreports")
     public String dataentry(Model model) {
         String LoginUserId = LoginUserInfo.getLoginUserId();
         model.addAttribute("LoginUserId", LoginUserId);
@@ -48,6 +48,6 @@ public class MainController {
 
         String UserRole = LoginUserInfo.getUserRole();
         model.addAttribute("UserRole", UserRole);
-        return "modules/flagpole/reports";
+        return "modules/flagpole/adminreports";
     }
 }
diff --git a/src/main/java/com/gcc/flagpoles_services/flagpoles/service/FlagpoleSMSService.java b/src/main/java/com/gcc/flagpoles_services/flagpoles/service/FlagpoleSMSService.java
index 7b88954..0fbfbc0 100644
--- a/src/main/java/com/gcc/flagpoles_services/flagpoles/service/FlagpoleSMSService.java
+++ b/src/main/java/com/gcc/flagpoles_services/flagpoles/service/FlagpoleSMSService.java
@@ -245,4 +245,85 @@ public class FlagpoleSMSService {
                 }
         }
 
+        ///// permanent request approved and rejected sms
+
+        public String sendPermanentRequestApproved(String mobileNo, String requestId) {
+
+                String message = "Your Permanent Flag Pole / Statue permission request has been approved. "
+                                + "Request ID: " + requestId
+                                + ".  Please proceed as per the permitted guidelines. By GCC";
+
+                // Encode message and fix colon issue (gateway not decoding %3A)
+                String encodedMsg = URLEncoder.encode(message, StandardCharsets.UTF_8)
+                                .replace("%3A", ":")
+                                .replace("%2F", "/");
+
+                String urlString = appConfig.getOtpUrl()
+                                + "from=GCCCRP"
+                                + "&key=" + key
+                                + "&sender=GCCCRP"
+                                + "&to=" + mobileNo
+                                + "&body=" + encodedMsg
+                                + "&entityid=1401572690000011081"
+                                + "&templateid=1407177062247610982";
+
+                System.out.println("SMS URL:- " + urlString);
+
+                String response = messageUtility.sendSMS(urlString);
+                System.out.println("SMS RESPONSE:- " + response);
+
+                return response;
+        }
+
+        public String sendPermanentRequestRejected(String mobileNo,
+                        String requestId) {
+
+                try {
+
+                        String message = "Your Permanent Flag Pole / Statue permission request has been rejected. "
+                                        + "Request ID: " + requestId
+                                        + ". Review the details in the portal https://gccservices.in/flagpolesregistration/status\r\n"
+                                        + "By GCC";
+
+                        String encodedMsg = URLEncoder.encode(message, StandardCharsets.UTF_8);
+
+                        String urlString = appConfig.getOtpUrl()
+                                        + "from=GCCCRP"
+                                        + "&key=" + key
+                                        + "&sender=GCCCRP"
+                                        + "&to=" + mobileNo
+                                        + "&body=" + encodedMsg
+                                        + "&entityid=1401572690000011081"
+                                        + "&templateid=1407177062255650311";
+
+                        System.out.println("FINAL SMS URL:- " + urlString);
+
+                        URL apiUrl = new URL(urlString);
+                        HttpURLConnection conn = (HttpURLConnection) apiUrl.openConnection();
+                        conn.setRequestMethod("GET");
+                        conn.setConnectTimeout(15000);
+                        conn.setReadTimeout(15000);
+
+                        BufferedReader in = new BufferedReader(
+                                        new InputStreamReader(conn.getInputStream()));
+                        String inputLine;
+                        StringBuilder content = new StringBuilder();
+
+                        while ((inputLine = in.readLine()) != null) {
+                                content.append(inputLine);
+                        }
+
+                        in.close();
+                        conn.disconnect();
+
+                        System.out.println("DIRECT SMS RESPONSE:- " + content.toString());
+
+                        return content.toString();
+
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        return "FAILED";
+                }
+        }
+
 }
diff --git a/src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java b/src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java
index 9fd958b..e277874 100644
--- a/src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java
+++ b/src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java
@@ -1,18 +1,23 @@
 package com.gcc.flagpoles_services.flagpoles.service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.sql.DataSource;
 import javax.transaction.Transactional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 @Service
 public class RdoService {
 
@@ -24,6 +29,9 @@ public class RdoService {
     @Autowired
     private FlagpoleSMSService smsService;
 
+    @Value("${fileBaseUrlImages}")
+    private String fileBaseUrlImages;
+
     @Autowired
     public void setMysqlAppJdbcTemplate(
             @Qualifier("mysqlAppDataSource") DataSource dataSource) {
@@ -93,44 +101,21 @@ public class RdoService {
         return list.isEmpty() ? null : list.get(0);
     }
 
-    // public List<Map<String, Object>> getOfficerFeedbackHistoryByRefId(
-    // String refid,
-    // String username) {
-
-    // Integer deptId = getDepartmentIdByUsername(username);
-    // String departmentName = getDepartmentNameByUsername(username);
-    // boolean isRdo = isRdoDepartment(departmentName);
-
-    // StringBuilder sql = new StringBuilder("""
-    // SELECT
-    // ofb.refid,
-    // dl.department_name,
-    // ofb.status,
-    // ofb.remarks,
-    // ofb.cby,
-    // DATE_FORMAT(ofb.cdate, '%d-%m-%Y %h:%i %p') AS action_date
-    // FROM officer_feedback ofb
-    // JOIN department_login dl
-    // ON ofb.dept_id = dl.dpid
-    // WHERE ofb.refid = ?
-    // AND ofb.is_active = 1
-    // AND ofb.is_delete = 0
-    // """);
-
-    // List<Object> params = new ArrayList<>();
-    // params.add(refid);
-
-    // // 🔥 NON-RDO → show ONLY own department history
-    // if (!isRdo) {
-    // sql.append(" AND ofb.dept_id = ? ");
-    // params.add(deptId);
-    // }
-
-    // sql.append(" ORDER BY ofb.cdate ASC ");
-
-    // return mysqlFlagPoleJdbcTemplate.queryForList(sql.toString(),
-    // params.toArray());
-    // }
+    public boolean isAdminViewUser(String gccUserId) {
+
+        String sql = """
+                    SELECT COUNT(*)
+                    FROM department_login
+                    WHERE gcc_user_id = ?
+                      AND admin_view = 1
+                      AND is_active = 1
+                      AND is_delete = 0
+                """;
+
+        Integer count = mysqlFlagPoleJdbcTemplate.queryForObject(sql, Integer.class, gccUserId);
+
+        return count != null && count > 0;
+    }
 
     private boolean hasValue(String s) {
         return s != null && !s.trim().isEmpty();
@@ -153,6 +138,21 @@ public class RdoService {
         /* 🔥 Resolve access (gcc_apps) */
         List<Map<String, Object>> access = getUserAccess(appUserId);
 
+        /* 🔥 Resolve officer details (for DRO check) */
+        Map<String, Object> officerDetails = getOfficerDetailsByUserId(gccUserId);
+        Integer droMember = (officerDetails != null) ? (Integer) officerDetails.get("dro_member") : null;
+        boolean isDro = (droMember != null && droMember == 1);
+
+        Integer zlscMember = (officerDetails != null) ? (Integer) officerDetails.get("zlsc_members") : null;
+        boolean isZlscMember = (zlscMember != null && zlscMember == 1);
+
+        Integer dlcMember = (officerDetails != null) ? (Integer) officerDetails.get("dlc_members") : null;
+        boolean isDlcMember = (dlcMember != null && dlcMember == 1);
+
+        Integer finalAuthPerm = (officerDetails != null) ? (Integer) officerDetails.get("final_authority_permanent")
+                : null;
+        boolean isFinalAuthorityPermanent = (finalAuthPerm != null && finalAuthPerm == 1);
+
         String zone = null;
         String zoneArray = null;
         String wardArray = null;
@@ -200,8 +200,12 @@ public class RdoService {
         List<Object> params = new ArrayList<>();
         params.add(refid);
 
-        /* 🔥 Only NON-RDO & NON-ZONAL are restricted */
-        if (!isRdo && !isZonalOfficer) {
+        /*
+         * 🔥 Only NON-RDO & NON-ZONAL & NON-DRO & NON-Zlsc & NON-DLC &
+         * NON-FINAL-AUTH-PERM are
+         * restricted
+         */
+        if (!isRdo && !isZonalOfficer && !isDro && !isZlscMember && !isDlcMember && !isFinalAuthorityPermanent) {
             sql.append(" AND ofb.dept_id = ? ");
             params.add(deptId);
         }
@@ -212,68 +216,6 @@ public class RdoService {
                 params.toArray());
     }
 
-    // to show for all departments
-    // public List<Map<String, Object>> getOfficerFeedbackHistoryByRefId(
-    // String refid,
-    // String gccUserId) {
-
-    // /* 🔥 Just validate gccUserId exists */
-    // Long appUserId = getAppUserIdByGccUserId(gccUserId);
-    // if (appUserId == null) {
-    // throw new RuntimeException("Invalid gccUserId: " + gccUserId);
-    // }
-
-    // String sql = """
-    // SELECT
-    // ofb.refid,
-    // dl.department_name,
-    // ofb.status,
-    // ofb.remarks,
-    // ofb.cby,
-    // DATE_FORMAT(ofb.cdate, '%d-%m-%Y %h:%i %p') AS action_date
-    // FROM officer_feedback ofb
-    // JOIN department_login dl
-    // ON ofb.dept_id = dl.dpid
-    // WHERE ofb.refid = ?
-    // AND ofb.is_active = 1
-    // AND ofb.is_delete = 0
-    // ORDER BY ofb.cdate ASC
-    // """;
-
-    // return mysqlFlagPoleJdbcTemplate.queryForList(sql, refid);
-    // }
-
-    // public int insertOfficerFeedback(
-    // String refId,
-    // Integer deptId,
-    // String status,
-    // String remarks,
-    // String createdBy) {
-
-    // String sql = """
-    // INSERT INTO officer_feedback
-    // (
-    // refid,
-    // dept_id,
-    // status,
-    // remarks,
-    // cby,
-    // cdate,
-    // is_active,
-    // is_delete
-    // )
-    // VALUES (?, ?, ?, ?, ?, NOW(), 1, 0)
-    // """;
-
-    // return mysqlFlagPoleJdbcTemplate.update(
-    // sql,
-    // refId,
-    // deptId,
-    // status,
-    // remarks,
-    // createdBy);
-    // }
-
     public int insertOfficerFeedback(
             String refId,
             Integer deptId,
@@ -310,17 +252,6 @@ public class RdoService {
     }
 
     //
-    // public List<Map<String, Object>> getUserAccess(String userLogin) {
-
-    // String sql = """
-    // SELECT lmu.zonearray, lmu.wardarray
-    // FROM login_mapping_user lmu
-    // JOIN appusers au ON au.id = lmu.appuser_id
-    // WHERE au.username = ?
-    // """;
-
-    // return mysqlAppJdbcTemplate.queryForList(sql, userLogin);
-    // }
 
     public List<Map<String, Object>> getUserAccess(Long appUserId) {
 
@@ -333,6 +264,21 @@ public class RdoService {
         return mysqlAppJdbcTemplate.queryForList(sql, appUserId);
     }
 
+    /* 🔥 Fetch all Zonal Officers (userids) for a given zone */
+    public List<String> getZonalOfficerUserIdsByZone(String zone) {
+        // We need 'userid' from appusers. login_mapping_user has appuser_id.
+        // So we join login_mapping_user -> appusers
+        String sql = """
+                    SELECT u.userid
+                    FROM login_mapping_user lmu
+                    JOIN appusers u ON lmu.appuser_id = u.id
+                    WHERE lmu.zone = ?
+                """;
+        // Note: The user said "zone 06 means same 06 i mapped for other officer".
+        // Assuming 'zone' in DB is exactly the string (e.g., "06").
+        return mysqlAppJdbcTemplate.queryForList(sql, String.class, zone);
+    }
+
     public String resolveGccUserId(String input) {
 
         // already numeric
@@ -374,21 +320,64 @@ public class RdoService {
         return list.isEmpty() ? null : list.get(0);
     }
 
-    public Integer getDepartmentIdByUserId(String gccUserId) {
+    public Map<String, Object> getOfficerDetailsByUserId(String gccUserId) {
 
         String sql = """
-                    SELECT dpid
+                    SELECT dpid, zlsc_members, dlc_members, gcc_user_id, dro_member, final_authority_permanent
                     FROM department_login
                     WHERE gcc_user_id = ?
                       AND is_active = 1
                       AND is_delete = 0
                 """;
 
-        List<Integer> list = mysqlFlagPoleJdbcTemplate.queryForList(sql, Integer.class, gccUserId);
+        List<Map<String, Object>> list = mysqlFlagPoleJdbcTemplate.queryForList(sql, gccUserId);
 
         return list.isEmpty() ? null : list.get(0);
     }
 
+    public Integer getDepartmentIdByUserId(String gccUserId) {
+        Map<String, Object> details = getOfficerDetailsByUserId(gccUserId);
+        return (details != null) ? (Integer) details.get("dpid") : null;
+    }
+
+    public List<Map<String, Object>> getVerificationQuestions(Integer gccUserQuestionsView) {
+
+        if (gccUserQuestionsView == null)
+            return Collections.emptyList();
+
+        String quesSql = """
+                    SELECT id, question_name
+                    FROM question_master
+                    WHERE isactive=1
+                      AND isdelete=0
+                      AND gcc_userid_questions_view = ?
+                    ORDER BY field_order ASC
+                """;
+
+        List<Map<String, Object>> questions = mysqlFlagPoleJdbcTemplate.queryForList(quesSql, gccUserQuestionsView);
+        // System.out.println("questions: " + questions);
+
+        for (Map<String, Object> q : questions) {
+
+            Integer quesId = (Integer) q.get("id");
+
+            List<Map<String, Object>> answers = mysqlFlagPoleJdbcTemplate.queryForList("""
+                        SELECT id, answer_name
+                        FROM ans_master
+                        WHERE ques_id=?
+                          AND isactive=1
+                          AND isdelete=0
+                        ORDER BY order_by ASC
+                    """, quesId);
+
+            q.put("answers", answers);
+        }
+
+        // System.out.println("questions: " + questions);
+
+        return questions;
+    }
+
     public String getUsernameByUserId(String gccUserId) {
 
         String sql = """
@@ -404,10 +393,19 @@ public class RdoService {
         return list.isEmpty() ? null : list.get(0);
     }
 
+    private String buildFileUrl(String path) {
+        if (path == null || path.trim().isEmpty()) {
+            return null;
+        }
+        return fileBaseUrlImages + path.replace("\\", "/");
+    }
+
     public List<Map<String, Object>> getAllRequestDetailsByUserLogin(
             String gccUserId,
             String startDate,
-            String endDate) {
+            String endDate,
+            String applicationType // 1 = TEMP, 2 = PERM, null = ALL
+    ) {
 
         /* 🔥 Resolve appuser_id */
         Long appUserId = getAppUserIdByGccUserId(gccUserId);
@@ -415,34 +413,49 @@ public class RdoService {
             throw new RuntimeException("Invalid gccUserId: " + gccUserId);
         }
 
-        /* 🔥 Resolve department id */
-        Integer deptId = getDepartmentIdByUserId(gccUserId);
-        if (deptId == null) {
+        /* 🔥 Resolve department & zlsC */
+        Map<String, Object> officerDetails = getOfficerDetailsByUserId(gccUserId);
+        if (officerDetails == null) {
             throw new RuntimeException("Department mapping missing for gccUserId: " + gccUserId);
         }
 
+        Integer deptId = (Integer) officerDetails.get("dpid");
+        Integer zlscMember = (Integer) officerDetails.get("zlsc_members");
+        boolean isZlscMember = (zlscMember != null && zlscMember == 1);
+        Integer dlcMember = (Integer) officerDetails.get("dlc_members");
+        boolean isDlcMember = (dlcMember != null && dlcMember == 1);
+        Integer droMember = (Integer) officerDetails.get("dro_member");
+        boolean isDro = (droMember != null && droMember == 1);
+        Integer finalAuthPerm = (Integer) officerDetails.get("final_authority_permanent");
+        boolean isFinalAuthorityPermanent = (finalAuthPerm != null && finalAuthPerm == 1);
+
+        Integer gccUserQuestionsView = (Integer) officerDetails.get("gcc_user_id");
+
+        final List<Map<String, Object>> verificationQuestions = (isZlscMember || isDlcMember || isDro)
+                ? getVerificationQuestions(gccUserQuestionsView)
+                : null;
+
+        if (verificationQuestions != null) {
+            // System.out.println("DEBUG: verificationQuestions size=" +
+            // verificationQuestions.size());
+        } else {
+            // System.out.println("DEBUG: verificationQuestions is NULL");
+        }
+
         /* 🔥 Resolve access */
         List<Map<String, Object>> access = getUserAccess(appUserId);
 
-        String zone = null;
-        String zoneArray = null;
-        String wardArray = null;
-
-        boolean isRdo = false;
-        boolean isZonalOfficer = false;
+        String zone = null, zoneArray = null, wardArray = null;
+        boolean isRdo = false, isZonalOfficer = false;
 
         if (!access.isEmpty()) {
-
             zone = (String) access.get(0).get("zone");
             zoneArray = (String) access.get(0).get("zonearray");
             wardArray = (String) access.get(0).get("wardarray");
 
-            // RDO → zonearray + wardarray
             if (hasValue(zoneArray) && hasValue(wardArray)) {
                 isRdo = true;
-            }
-            // Zonal → single zone
-            else if (hasValue(zone)) {
+            } else if (hasValue(zone)) {
                 isZonalOfficer = true;
             }
         }
@@ -461,38 +474,95 @@ public class RdoService {
                         urd.rdo_status,
                         urd.final_status,
                         urd.no_of_days,
+                        urd.total_cost,
+                        urd.others_specify_statue_material,
+                        urd.place_of_erection,
+
+                        CASE WHEN urd.patta_image_path IS NOT NULL
+                            THEN CONCAT(?,'/gcc/files',urd.patta_image_path) END AS patta_image_url,
+                        CASE WHEN urd.affidavit_image_path IS NOT NULL
+                            THEN CONCAT(?,'/gcc/files',urd.affidavit_image_path) END AS affidavit_image_url,
+                        CASE WHEN urd.ec_image_path IS NOT NULL
+                            THEN CONCAT(?,'/gcc/files',urd.ec_image_path) END AS ec_image_url,
+                        CASE WHEN urd.fmb_sketch_path IS NOT NULL
+                            THEN CONCAT(?,'/gcc/files',urd.fmb_sketch_path) END AS fmb_sketch_url,
+                        CASE WHEN urd.aadhaar_image_path IS NOT NULL
+                            THEN CONCAT(?,'/gcc/files',urd.aadhaar_image_path) END AS aadhaar_image_url,
+
+                        at.id AS application_type_id,
+                        at.type AS application_type_name,
+                        ao.option_name,
+                        it.installation_name,
 
                         sd.street_name,
                         sd.zone,
                         sd.ward,
                         sd.no_of_poles,
+                        sd.no_of_statue,
                         sd.height,
                         sd.street_cost,
 
                         fm.flag_material_name AS flag_material,
                         pm.pole_material_name AS pole_material,
+                        sm.statue_material_type,
+                        pdm.statue_pedestal_type AS pedestal_material,
 
-                        urd.total_cost,
                         et.event_name
 
                     FROM user_request_details urd
+
                     LEFT JOIN street_details sd
                            ON urd.refid = sd.refid
                           AND sd.is_active = 1
                           AND sd.is_delete = 0
+
                     LEFT JOIN event_type et ON urd.event_id = et.id
                     LEFT JOIN flag_material fm ON sd.flag_material_id = fm.id
                     LEFT JOIN pole_material pm ON sd.pole_material_id = pm.id
+                    LEFT JOIN statue_material sm ON sd.statue_material_id = sm.id
+                    LEFT JOIN pedestal_material pdm ON sd.pedestal_material_id = pdm.id
+
+                    LEFT JOIN application_type at ON urd.application_type = at.id
+                    LEFT JOIN application_option ao ON urd.application_option = ao.id
+                    LEFT JOIN installation_type it ON urd.installation_type = it.id
+
                     WHERE 1 = 1
                 """);
 
         List<Object> params = new ArrayList<>();
 
-        /* 🔥 1. REMOVE RDO-FINALIZED */
-        // sql.append(" AND (urd.rdo_status IS NULL OR urd.rdo_status = '') ");
+        /* 🔥 fileBaseUrl for all images */
+        params.add(fileBaseUrlImages);
+        params.add(fileBaseUrlImages);
+        params.add(fileBaseUrlImages);
+        params.add(fileBaseUrlImages);
+        params.add(fileBaseUrlImages);
+
+        /* 🔥 Only pending final */
         sql.append(" AND (urd.final_status IS NULL OR urd.final_status = '') ");
 
-        /* 🔥 2. REMOVE ALREADY DECIDED BY SAME DEPT */
+        /* Zlsc → PERMANENT only & Processed by DRO */
+        /* Zlsc & Final Authority Permanent → PERMANENT only & Processed by DRO */
+        if (isFinalAuthorityPermanent) {
+            sql.append(" AND urd.application_type = 2 ");
+        } else if (isZlscMember || isDlcMember) {
+            sql.append(" AND urd.application_type = 2 ");
+
+            /* 🔥 Must be processed by DRO first */
+            sql.append("""
+                        AND urd.refid IN (
+                            SELECT ofb.refid
+                            FROM officer_feedback ofb
+                            JOIN department_login dl ON ofb.dept_id = dl.dpid
+                            WHERE dl.dro_member = 1
+                              AND ofb.is_active = 1
+                              AND ofb.is_delete = 0
+                              AND ofb.status IN ('APPROVED', 'REJECTED')
+                        )
+                    """);
+        }
+
+        /* 🔥 Exclude already decided by same dept */
         sql.append("""
                     AND urd.refid NOT IN (
                         SELECT ofb.refid
@@ -505,29 +575,95 @@ public class RdoService {
                 """);
         params.add(deptId);
 
-        /* 🔥 3a. RDO → multi zone + ward */
+        /* 🔥 TEMP / PERM filter */
+        if (hasValue(applicationType)) {
+            sql.append(" AND urd.application_type = ? ");
+            params.add(applicationType);
+        }
+
+        /* 🔥 RDO */
         if (isRdo) {
-            sql.append(" AND FIND_IN_SET(sd.zone, ?) ");
-            sql.append(" AND FIND_IN_SET(sd.ward, ?) ");
+            sql.append(" AND FIND_IN_SET(sd.zone, ?) AND FIND_IN_SET(sd.ward, ?) ");
             params.add(zoneArray);
             params.add(wardArray);
         }
-
-        /* 🔥 3b. ZONAL → single zone */
+        /* 🔥 Zonal */
         else if (isZonalOfficer) {
             sql.append(" AND sd.zone = ? ");
             params.add(zone);
         }
+        /* 🔥 DRO Logic */
+        else if (isDro) {
+
+            /* 🔥 DRO → PERMANENT only */
+            sql.append(" AND urd.application_type = 2 ");
+
+            /* 🔥 Fetch all Zonal Officers grouped by Zone */
+            Map<String, List<String>> zoneOfficersMap = getMapOfZonalOfficersByZone();
+
+            if (zoneOfficersMap.isEmpty()) {
+                // Safety: If no mapping found, show nothing to be safe
+                sql.append(" AND 1=0 ");
+            } else {
+
+                sql.append(" AND ( ");
+
+                int i = 0;
+                for (Map.Entry<String, List<String>> entry : zoneOfficersMap.entrySet()) {
+                    String zoneKey = entry.getKey();
+                    List<String> officerIds = entry.getValue();
+
+                    if (officerIds.isEmpty())
+                        continue;
+
+                    if (i > 0)
+                        sql.append(" OR ");
+
+                    String joinedIds = officerIds.stream()
+                            .map(id -> "'" + id + "'")
+                            .collect(Collectors.joining(","));
+                    int count = officerIds.size();
+
+                    /*
+                     * Check:
+                     * 1. Request is in this Zone
+                     * 2. Request has 'APPROVED' OR 'REJECTED' feedback from ALL officers
+                     */
+                    sql.append("""
+                                (
+                                    sd.zone = '%s'
+                                    AND urd.refid IN (
+                                        SELECT ofb.refid
+                                        FROM officer_feedback ofb
+                                        WHERE ofb.status IN ('APPROVED', 'REJECTED')
+                                          AND ofb.gcc_user_id IN (%s)
+                                          AND ofb.is_active = 1
+                                          AND ofb.is_delete = 0
+                                        GROUP BY ofb.refid
+                                        HAVING COUNT(DISTINCT ofb.gcc_user_id) = %d
+                                    )
+                                )
+                            """.formatted(zoneKey, joinedIds, count));
+
+                    i++;
+                }
 
-        /* 🔹 DATE FILTER */
-        if (hasValue(startDate) && hasValue(endDate)) {
+                sql.append(" ) ");
+            }
 
+            /* 🔥 If DRO is mapped to a specific Zone, restrict to that zone as well */
+            if (hasValue(zone)) {
+                sql.append(" AND sd.zone = ? ");
+                params.add(zone);
+            }
+        }
+
+        /* 🔹 Date filter */
+        if (hasValue(startDate) && hasValue(endDate)) {
             sql.append(" AND DATE(urd.event_date) BETWEEN ? AND ? ");
             params.add(startDate);
             params.add(endDate);
-
         } else if (hasValue(startDate)) {
-
             sql.append(" AND DATE(urd.event_date) = ? ");
             params.add(startDate);
         }
@@ -549,7 +685,9 @@ public class RdoService {
             String refid = (String) row.get("refid");
 
             Map<String, Object> request = resultMap.computeIfAbsent(refid, k -> {
+
                 Map<String, Object> map = new LinkedHashMap<>();
+
                 map.put("refid", row.get("refid"));
                 map.put("applicant_name", row.get("applicant_name"));
                 map.put("mobile_number", row.get("mobile_number"));
@@ -563,7 +701,30 @@ public class RdoService {
                 map.put("no_of_days", row.get("no_of_days"));
                 map.put("event_name", row.get("event_name"));
                 map.put("total_cost", row.get("total_cost"));
+
+                map.put("patta_image_url", isFinalAuthorityPermanent ? null : row.get("patta_image_url"));
+                map.put("affidavit_image_url", isFinalAuthorityPermanent ? null : row.get("affidavit_image_url"));
+                map.put("ec_image_url", isFinalAuthorityPermanent ? null : row.get("ec_image_url"));
+                map.put("fmb_sketch_url", isFinalAuthorityPermanent ? null : row.get("fmb_sketch_url"));
+                map.put("aadhaar_image_url", isFinalAuthorityPermanent ? null : row.get("aadhaar_image_url"));
+
+                map.put("application_type_id", row.get("application_type_id"));
+                map.put("application_type_name", row.get("application_type_name"));
+                map.put("option_name", row.get("option_name"));
+                map.put("installation_name", row.get("installation_name"));
+                map.put("others_specify_statue_material", row.get("others_specify_statue_material"));
+                map.put("place_of_erection", row.get("place_of_erection"));
+
                 map.put("streets", new ArrayList<>());
+                map.put("history", new ArrayList<>());
+
+                if ((isZlscMember || isDlcMember || isDro)
+                        && "PERMANENT".equalsIgnoreCase((String) row.get("application_type_name"))) {
+                    map.put("verification_questions", verificationQuestions);
+                }
+
+                map.put("is_final_authority_perm", isFinalAuthorityPermanent);
+
                 return map;
             });
 
@@ -572,179 +733,60 @@ public class RdoService {
             street.put("zone", row.get("zone"));
             street.put("ward", row.get("ward"));
             street.put("no_of_poles", row.get("no_of_poles"));
+            street.put("no_of_statue", row.get("no_of_statue"));
             street.put("height", row.get("height"));
             street.put("street_cost", row.get("street_cost"));
             street.put("flag_material", row.get("flag_material"));
             street.put("pole_material", row.get("pole_material"));
+            street.put("statue_material", row.get("statue_material_type"));
+            street.put("pedestal_material", row.get("pedestal_material"));
 
             ((List<Map<String, Object>>) request.get("streets")).add(street);
         }
 
+        /* 🔥 Fetch History for all refIds */
+        if (!resultMap.isEmpty()) {
+            String ids = resultMap.keySet().stream()
+                    .map(id -> "'" + id + "'")
+                    .collect(Collectors.joining(","));
+
+            String historySql = """
+                        SELECT
+                            ofb.refid,
+                            dl.department_name,
+                            ofb.status,
+                            ofb.remarks,
+                            DATE_FORMAT(ofb.cdate, '%%d-%%m-%%Y %%h:%%i %%p') AS action_date
+                        FROM officer_feedback ofb
+                        LEFT JOIN department_login dl ON ofb.dept_id = dl.dpid
+                        WHERE ofb.refid IN (%s)
+                          AND ofb.is_active=1
+                          AND ofb.is_delete=0
+                        ORDER BY ofb.cdate ASC
+                    """.formatted(ids);
+
+            List<Map<String, Object>> historyRows = mysqlFlagPoleJdbcTemplate.queryForList(historySql);
+
+            for (Map<String, Object> hRow : historyRows) {
+                String ref = (String) hRow.get("refid");
+                Map<String, Object> req = resultMap.get(ref);
+                if (req != null) {
+                    List<Map<String, Object>> hist = (List<Map<String, Object>>) req.get("history");
+                    if (hist != null) {
+                        Map<String, Object> hObj = new LinkedHashMap<>();
+                        hObj.put("department_name", hRow.get("department_name"));
+                        hObj.put("status", hRow.get("status"));
+                        hObj.put("remarks", hRow.get("remarks"));
+                        hObj.put("action_date", hRow.get("action_date"));
+                        hist.add(hObj);
+                    }
+                }
+            }
+        }
+
         return new ArrayList<>(resultMap.values());
     }
 
-    // old with rdo and zonal officer final
-    // @Transactional
-    // public int updateOfficerDecision(
-    // String refId,
-    // String status,
-    // String remarks,
-    // String gccUserId,
-    // String username) {
-
-    // /* 🔹 Resolve appuser_id */
-    // Long appUserId = getAppUserIdByGccUserId(gccUserId);
-    // if (appUserId == null) {
-    // throw new RuntimeException("Invalid gccUserId");
-    // }
-
-    // /* 🔹 Resolve department */
-    // Integer deptId = getDepartmentIdByUserId(gccUserId);
-    // if (deptId == null) {
-    // throw new RuntimeException("User not mapped to department");
-    // }
-
-    // /* 🔹 Access */
-    // List<Map<String, Object>> access = getUserAccess(appUserId);
-
-    // String zone = null;
-    // String zoneArray = null;
-    // String wardArray = null;
-
-    // boolean isRdo = false;
-    // boolean isZonalOfficer = false;
-
-    // if (!access.isEmpty()) {
-
-    // Map<String, Object> row = access.get(0);
-
-    // zone = row.get("zone") != null ? row.get("zone").toString() : null;
-    // zoneArray = row.get("zonearray") != null ? row.get("zonearray").toString() :
-    // null;
-    // wardArray = row.get("wardarray") != null ? row.get("wardarray").toString() :
-    // null;
-
-    // /* ✅ RDO → zonearray + wardarray */
-    // if (hasValue(zoneArray) && hasValue(wardArray)) {
-    // isRdo = true;
-    // }
-
-    // /* ✅ Zonal Officer → zone 01–15 */
-    // if (hasValue(zone) && zone.matches("^(0[1-9]|1[0-5])$")) {
-    // isZonalOfficer = true;
-    // }
-    // }
-
-    // /*
-    // * =====================================================
-    // * 🔹 INSERT FEEDBACK (ALL USERS)
-    // * =====================================================
-    // */
-
-    // insertOfficerFeedback(
-    // refId,
-    // deptId,
-    // Integer.valueOf(gccUserId),
-    // status,
-    // remarks,
-    // username);
-
-    // /*
-    // * =====================================================
-    // * 🔹 RDO FLOW
-    // * =====================================================
-    // */
-
-    // if (isRdo) {
-
-    // String historySql = """
-    // INSERT INTO user_request_details_history
-    // (
-    // refid, applicant_name, mobile_number, applicant_address,
-    // event_id, event_date, no_of_days, total_poles, total_cost,
-    // ae_status, rdo_status, rdo_remarks,
-    // approved_by, approved_date,
-    // payment_status, refund_status, booking_status, cdate
-    // )
-    // SELECT
-    // refid, applicant_name, mobile_number, applicant_address,
-    // event_id, event_date, no_of_days, total_poles, total_cost,
-    // ae_status, ?, ?, ?, NOW(),
-    // payment_status, refund_status, booking_status, NOW()
-    // FROM user_request_details
-    // WHERE refid = ?
-    // """;
-
-    // mysqlFlagPoleJdbcTemplate.update(historySql, status, remarks, gccUserId,
-    // refId);
-
-    // String updateSql = """
-    // UPDATE user_request_details
-    // SET
-    // rdo_status = ?,
-    // rdo_remarks = ?,
-    // approved_by = ?,
-    // rdo_updated_date = NOW()
-    // WHERE refid = ?
-    // """;
-
-    // return mysqlFlagPoleJdbcTemplate.update(updateSql, status, remarks,
-    // gccUserId, refId);
-    // }
-
-    // /*
-    // * =====================================================
-    // * 🔹 ZONAL OFFICER FLOW (FINAL)
-    // * =====================================================
-    // */
-
-    // if (isZonalOfficer) {
-
-    // String historySql = """
-    // INSERT INTO user_request_details_history
-    // (
-    // refid, applicant_name, mobile_number, applicant_address,
-    // event_id, event_date, no_of_days, total_poles, total_cost,
-    // ae_status, rdo_status, rdo_remarks,
-    // final_status, final_remarks, final_approved_by, final_approved_date,
-    // payment_status, refund_status, booking_status, cdate
-    // )
-    // SELECT
-    // refid, applicant_name, mobile_number, applicant_address,
-    // event_id, event_date, no_of_days, total_poles, total_cost,
-    // ae_status, rdo_status, rdo_remarks,
-    // ?, ?, ?, NOW(),
-    // payment_status, refund_status, booking_status, NOW()
-    // FROM user_request_details
-    // WHERE refid = ?
-    // """;
-
-    // mysqlFlagPoleJdbcTemplate.update(historySql, status, remarks, gccUserId,
-    // refId);
-
-    // String updateSql = """
-    // UPDATE user_request_details
-    // SET
-    // final_status = ?,
-    // final_remarks = ?,
-    // final_approved_by = ?,
-    // final_approved_date = NOW()
-    // WHERE refid = ?
-    // """;
-
-    // return mysqlFlagPoleJdbcTemplate.update(updateSql, status, remarks,
-    // gccUserId, refId);
-    // }
-
-    // /*
-    // * =====================================================
-    // * 🔹 OTHER DEPARTMENTS → FEEDBACK ONLY
-    // * =====================================================
-    // */
-
-    // return 1;
-    // }
-
     private boolean isFinalAuthorityForZone(String gccUserId, String refId) {
 
         Integer count = mysqlFlagPoleJdbcTemplate.queryForObject("""
@@ -766,21 +808,22 @@ public class RdoService {
             String status,
             String remarks,
             String gccUserId,
-            String username) {
+            String username,
+            String answersJson) throws Exception {
 
-        /* 🔹 Resolve appuser_id */
+        /* Resolve appuser_id */
         Long appUserId = getAppUserIdByGccUserId(gccUserId);
         if (appUserId == null) {
             throw new RuntimeException("Invalid gccUserId");
         }
 
-        /* 🔹 Resolve department */
+        /* Resolve department */
         Integer deptId = getDepartmentIdByUserId(gccUserId);
         if (deptId == null) {
             throw new RuntimeException("User not mapped to department");
         }
 
-        /* 🔹 Access (zone / ward used for mapping + RDO detection) */
+        /* Access (zone / ward used for mapping + RDO detection) */
         List<Map<String, Object>> access = getUserAccess(appUserId);
 
         String zone = null;
@@ -803,27 +846,65 @@ public class RdoService {
             }
         }
 
-        /* 🔹 Final Authority must match BOTH: zone + final_authority flag */
+        /* Final Authority must match BOTH: zone + final_authority flag */
         boolean isFinalAuthority = isFinalAuthorityForZone(gccUserId, refId);
 
         /*
          * =====================================================
-         * 🔐 Check if already FINALIZED
+         * Check already FINALIZED & Get Application Type
          * =====================================================
          */
 
-        String finalStatus = mysqlFlagPoleJdbcTemplate.queryForObject(
-                "SELECT final_status FROM user_request_details WHERE refid = ?",
-                String.class,
+        Map<String, Object> requestInfo = mysqlFlagPoleJdbcTemplate.queryForMap(
+                "SELECT final_status, application_type FROM user_request_details WHERE refid = ?",
                 refId);
 
+        String finalStatus = (String) requestInfo.get("final_status");
+        Number appTypeNum = (Number) requestInfo.get("application_type");
+        Integer applicationType = (appTypeNum != null) ? appTypeNum.intValue() : null;
+
+        /*
+         * 🔥 Resolve officer details (for Permanent Final Authority)
+         */
+        Map<String, Object> officerDetails = getOfficerDetailsByUserId(gccUserId);
+        Integer finalAuthPerm = (officerDetails != null) ? (Integer) officerDetails.get("final_authority_permanent")
+                : null;
+        boolean isFinalAuthorityPermanent = (finalAuthPerm != null && finalAuthPerm == 1);
+
+        /*
+         * 🔥 ZOs act as Final Authority ONLY if configured (1) and Application Type is
+         * TEMPORARY (1).
+         * If PERMANENT (2):
+         * - Normal ZOs should NOT update final_status.
+         * - Users with 'final_authority_permanent = 1' SHOULD update final_status.
+         * 
+         * If Application Type is unknown (null), we assume it's NOT Final Authority to
+         * allow workflow flexibility.
+         */
+        if (applicationType != null && applicationType == 2) {
+            if (isFinalAuthorityPermanent) {
+                isFinalAuthority = true;
+            } else {
+                isFinalAuthority = false;
+            }
+        } else {
+            /*
+             * For non-permanent (Temporary), standard logic applies (already set in
+             * `isFinalAuthorityForZone`)
+             */
+            /*
+             * ensure we don't accidentally enable it if applicationType is null, unless
+             * desired default
+             */
+        }
+
         if (finalStatus != null && !finalStatus.isBlank() && !isFinalAuthority) {
             throw new RuntimeException("Request already finalized by Final Authority");
         }
 
         /*
          * =====================================================
-         * 🔹 INSERT FEEDBACK (ALL USERS)
+         * INSERT FEEDBACK (EXISTING)
          * =====================================================
          */
 
@@ -837,83 +918,109 @@ public class RdoService {
 
         /*
          * =====================================================
-         * 🔹 FINAL AUTHORITY FLOW (ZONE + FLAG)
+         * 🔥 NEW: get fid + save verification answers
+         * =====================================================
+         */
+
+        Integer fid = mysqlFlagPoleJdbcTemplate.queryForObject(
+                "SELECT MAX(fid) FROM officer_feedback WHERE refid=? AND gcc_user_id=?",
+                Integer.class,
+                refId,
+                Integer.valueOf(gccUserId));
+
+        if (fid != null && answersJson != null && !answersJson.isBlank()) {
+
+            ObjectMapper mapper = new ObjectMapper();
+
+            List<Map<String, Object>> answers = mapper.readValue(answersJson, List.class);
+
+            for (Map<String, Object> a : answers) {
+
+                Integer quesId = Integer.valueOf(a.get("quesId").toString());
+                Integer ansId = Integer.valueOf(a.get("ansId").toString());
+
+                mysqlFlagPoleJdbcTemplate.update("""
+                            INSERT INTO officer_feedback_question_answers
+                            (fid, refid, ques_id, answer_id)
+                            VALUES (?,?,?,?)
+                        """, fid, refId, quesId, ansId);
+            }
+        }
+
+        /*
+         * =====================================================
+         * FINAL AUTHORITY FLOW (UNCHANGED)
          * =====================================================
          */
 
         if (isFinalAuthority) {
 
             String historySql = """
-                    INSERT INTO user_request_details_history
-                    (
-                        refid, applicant_name, mobile_number, applicant_address,
-                        event_id, event_date, no_of_days, total_poles, total_cost,
-                        ae_status, rdo_status, rdo_remarks,
-                        final_status, final_remarks, final_approved_by, final_approved_date,
-                        payment_status, refund_status, booking_status, cdate
-                    )
-                    SELECT
-                        refid, applicant_name, mobile_number, applicant_address,
-                        event_id, event_date, no_of_days, total_poles, total_cost,
-                        ae_status, rdo_status, rdo_remarks,
-                        ?, ?, ?, NOW(),
-                        payment_status, refund_status, booking_status, NOW()
-                    FROM user_request_details
-                    WHERE refid = ?
+                        INSERT INTO user_request_details_history
+                        (
+                            refid, applicant_name, mobile_number, applicant_address,
+                            event_id, event_date, no_of_days, total_poles, total_cost,
+                            ae_status, rdo_status, rdo_remarks,
+                            final_status, final_remarks, final_approved_by, final_approved_date,
+                            payment_status, refund_status, booking_status, cdate
+                        )
+                        SELECT
+                            refid, applicant_name, mobile_number, applicant_address,
+                            event_id, event_date, no_of_days, total_poles, total_cost,
+                            ae_status, rdo_status, rdo_remarks,
+                            ?, ?, ?, NOW(),
+                            payment_status, refund_status, booking_status, NOW()
+                        FROM user_request_details
+                        WHERE refid = ?
                     """;
 
             mysqlFlagPoleJdbcTemplate.update(historySql, status, remarks, gccUserId, refId);
 
             String updateSql = """
-                    UPDATE user_request_details
-                    SET
-                        final_status = ?,
-                        final_remarks = ?,
-                        final_approved_by = ?,
-                        final_approved_date = NOW()
-                    WHERE refid = ?
+                        UPDATE user_request_details
+                        SET final_status=?,
+                            final_remarks=?,
+                            final_approved_by=?,
+                            final_approved_date=NOW()
+                        WHERE refid=?
                     """;
 
             int updated = mysqlFlagPoleJdbcTemplate.update(updateSql, status, remarks, gccUserId, refId);
 
-            // ================= SEND SMS AFTER FINAL DECISION =================
-
             if ("APPROVED".equalsIgnoreCase(status)) {
-
                 try {
-
-                    String mobileNo = mysqlFlagPoleJdbcTemplate.queryForObject("""
-                            SELECT mobile_number
-                            FROM user_request_details
-                            WHERE refid = ?
-                            """, String.class, refId);
-
-                    if (mobileNo != null && !mobileNo.isBlank()) {
-                        smsService.userrequestApprovedsms(mobileNo, refId);
+                    String mobileNo = mysqlFlagPoleJdbcTemplate.queryForObject(
+                            "SELECT mobile_number FROM user_request_details WHERE refid=?",
+                            String.class, refId);
+
+                    if (mobileNo != null) {
+                        if (applicationType != null && applicationType == 2) {
+                            smsService.sendPermanentRequestApproved(mobileNo, refId);
+                        } else {
+                            smsService.userrequestApprovedsms(mobileNo, refId);
+                        }
                     }
 
                 } catch (Exception e) {
-                    System.err.println("Approved SMS failed for requestId: " + refId);
                     e.printStackTrace();
                 }
             }
 
             if ("REJECTED".equalsIgnoreCase(status)) {
-
                 try {
-
-                    String mobileNo = mysqlFlagPoleJdbcTemplate.queryForObject("""
-                            SELECT mobile_number
-                            FROM user_request_details
-                            WHERE refid = ?
-                            """, String.class, refId);
-
-                    if (mobileNo != null && !mobileNo.isBlank()) {
-                        smsService.userrequestRejectedsms(mobileNo, refId);
+                    String mobileNo = mysqlFlagPoleJdbcTemplate.queryForObject(
+                            "SELECT mobile_number FROM user_request_details WHERE refid=?",
+                            String.class, refId);
+
+                    if (mobileNo != null) {
+                        if (applicationType != null && applicationType == 2) {
+                            smsService.sendPermanentRequestRejected(mobileNo, refId);
+                        } else {
+                            smsService.userrequestRejectedsms(mobileNo, refId);
+                        }
                     }
 
                 } catch (Exception e) {
-                    System.err.println("Rejected SMS failed for requestId: " + refId);
                     e.printStackTrace();
                 }
             }
@@ -923,40 +1030,39 @@ public class RdoService {
 
         /*
          * =====================================================
-         * RDO FLOW (INTERMEDIATE ONLY)
+         * RDO FLOW (UNCHANGED)
          * =====================================================
          */
 
         if (isRdo) {
 
             String historySql = """
-                    INSERT INTO user_request_details_history
-                    (
-                        refid, applicant_name, mobile_number, applicant_address,
-                        event_id, event_date, no_of_days, total_poles, total_cost,
-                        ae_status, rdo_status, rdo_remarks,
-                        approved_by, approved_date,
-                        payment_status, refund_status, booking_status, cdate
-                    )
-                    SELECT
-                        refid, applicant_name, mobile_number, applicant_address,
-                        event_id, event_date, no_of_days, total_poles, total_cost,
-                        ae_status, ?, ?, ?, NOW(),
-                        payment_status, refund_status, booking_status, NOW()
-                    FROM user_request_details
-                    WHERE refid = ?
+                        INSERT INTO user_request_details_history
+                        (
+                            refid, applicant_name, mobile_number, applicant_address,
+                            event_id, event_date, no_of_days, total_poles, total_cost,
+                            ae_status, rdo_status, rdo_remarks,
+                            approved_by, approved_date,
+                            payment_status, refund_status, booking_status, cdate
+                        )
+                        SELECT
+                            refid, applicant_name, mobile_number, applicant_address,
+                            event_id, event_date, no_of_days, total_poles, total_cost,
+                            ae_status, ?, ?, ?, NOW(),
+                            payment_status, refund_status, booking_status, NOW()
+                        FROM user_request_details
+                        WHERE refid = ?
                     """;
 
             mysqlFlagPoleJdbcTemplate.update(historySql, status, remarks, gccUserId, refId);
 
             String updateSql = """
-                    UPDATE user_request_details
-                    SET
-                        rdo_status = ?,
-                        rdo_remarks = ?,
-                        approved_by = ?,
-                        rdo_updated_date = NOW()
-                    WHERE refid = ?
+                        UPDATE user_request_details
+                        SET rdo_status=?,
+                            rdo_remarks=?,
+                            approved_by=?,
+                            rdo_updated_date=NOW()
+                        WHERE refid=?
                     """;
 
             return mysqlFlagPoleJdbcTemplate.update(updateSql, status, remarks, gccUserId, refId);
@@ -965,224 +1071,6 @@ public class RdoService {
         return 1;
     }
 
-    // @Transactional
-    // public int updateOfficerDecision(
-    // String refId,
-    // String status,
-    // String remarks,
-    // String gccUserId,
-    // String username) {
-
-    // /* 🔹 Resolve appuser_id */
-    // Long appUserId = getAppUserIdByGccUserId(gccUserId);
-    // if (appUserId == null) {
-    // throw new RuntimeException("Invalid gccUserId");
-    // }
-
-    // /* 🔹 Resolve department */
-    // Integer deptId = getDepartmentIdByUserId(gccUserId);
-    // if (deptId == null) {
-    // throw new RuntimeException("User not mapped to department");
-    // }
-
-    // /* 🔹 Access */
-    // List<Map<String, Object>> access = getUserAccess(appUserId);
-
-    // String zone = null;
-    // String zoneArray = null;
-    // String wardArray = null;
-
-    // boolean isRdo = false;
-    // boolean isZonalOfficer = false;
-
-    // if (!access.isEmpty()) {
-
-    // Map<String, Object> row = access.get(0);
-
-    // zone = row.get("zone") != null ? row.get("zone").toString() : null;
-    // zoneArray = row.get("zonearray") != null ? row.get("zonearray").toString() :
-    // null;
-    // wardArray = row.get("wardarray") != null ? row.get("wardarray").toString() :
-    // null;
-
-    // if (hasValue(zoneArray) && hasValue(wardArray)) {
-    // isRdo = true;
-    // }
-
-    // if (hasValue(zone) && zone.matches("^(0[1-9]|1[0-5])$")) {
-    // isZonalOfficer = true;
-    // }
-    // }
-
-    // /*
-    // * =====================================================
-    // * 🔐 Check if already FINALIZED
-    // * =====================================================
-    // */
-
-    // String finalStatus = mysqlFlagPoleJdbcTemplate.queryForObject(
-    // "SELECT final_status FROM user_request_details WHERE refid = ?",
-    // String.class,
-    // refId);
-
-    // if (finalStatus != null && !finalStatus.isBlank() && !isZonalOfficer) {
-    // throw new RuntimeException("Request already finalized by Zonal Officer");
-    // }
-
-    // /*
-    // * =====================================================
-    // * 🔹 INSERT FEEDBACK (ALL USERS)
-    // * =====================================================
-    // */
-
-    // insertOfficerFeedback(
-    // refId,
-    // deptId,
-    // Integer.valueOf(gccUserId),
-    // status,
-    // remarks,
-    // username);
-
-    // /*
-    // * =====================================================
-    // * 🔹 ZONAL OFFICER FLOW (ONLY FINAL AUTHORITY)
-    // * =====================================================
-    // */
-
-    // if (isZonalOfficer) {
-
-    // String historySql = """
-    // INSERT INTO user_request_details_history
-    // (
-    // refid, applicant_name, mobile_number, applicant_address,
-    // event_id, event_date, no_of_days, total_poles, total_cost,
-    // ae_status, rdo_status, rdo_remarks,
-    // final_status, final_remarks, final_approved_by, final_approved_date,
-    // payment_status, refund_status, booking_status, cdate
-    // )
-    // SELECT
-    // refid, applicant_name, mobile_number, applicant_address,
-    // event_id, event_date, no_of_days, total_poles, total_cost,
-    // ae_status, rdo_status, rdo_remarks,
-    // ?, ?, ?, NOW(),
-    // payment_status, refund_status, booking_status, NOW()
-    // FROM user_request_details
-    // WHERE refid = ?
-    // """;
-
-    // mysqlFlagPoleJdbcTemplate.update(historySql, status, remarks, gccUserId,
-    // refId);
-
-    // String updateSql = """
-    // UPDATE user_request_details
-    // SET
-    // final_status = ?,
-    // final_remarks = ?,
-    // final_approved_by = ?,
-    // final_approved_date = NOW()
-    // WHERE refid = ?
-    // """;
-
-    // // return mysqlFlagPoleJdbcTemplate.update(updateSql, status, remarks,
-    // // gccUserId, refId);
-
-    // int updated = mysqlFlagPoleJdbcTemplate.update(updateSql, status, remarks,
-    // gccUserId, refId);
-
-    // // ================= SEND SMS AFTER FINAL APPROVAL =================
-    // if ("APPROVED".equalsIgnoreCase(status)) {
-
-    // try {
-
-    // String mobileNo = mysqlFlagPoleJdbcTemplate.queryForObject("""
-    // SELECT mobile_number
-    // FROM user_request_details
-    // WHERE refid = ?
-    // """, String.class, refId);
-
-    // if (mobileNo != null && !mobileNo.isBlank()) {
-    // smsService.userrequestApprovedsms(mobileNo, refId);
-    // }
-
-    // } catch (Exception e) {
-    // System.err.println("Approved SMS failed for requestId: " + refId);
-    // e.printStackTrace();
-    // }
-    // }
-
-    // if ("REJECTED".equalsIgnoreCase(status)) {
-
-    // try {
-    // System.out.println("Rejected RefID = " + refId);
-
-    // String mobileNo = mysqlFlagPoleJdbcTemplate.queryForObject("""
-    // SELECT mobile_number
-    // FROM user_request_details
-    // WHERE refid = ?
-    // """, String.class, refId);
-
-    // if (mobileNo != null && !mobileNo.isBlank()) {
-    // System.out.println("Rejected Mob Num = " + mobileNo);
-    // smsService.userrequestRejectedsms(mobileNo, refId);
-    // }
-
-    // } catch (Exception e) {
-    // System.err.println("Approved SMS failed for requestId: " + refId);
-    // e.printStackTrace();
-    // }
-    // }
-    // // ================================================================
-
-    // return updated;
-
-    // }
-
-    // /*
-    // * =====================================================
-    // * RDO FLOW (ONLY RDO FIELDS)
-    // * =====================================================
-    // */
-
-    // if (isRdo) {
-
-    // String historySql = """
-    // INSERT INTO user_request_details_history
-    // (
-    // refid, applicant_name, mobile_number, applicant_address,
-    // event_id, event_date, no_of_days, total_poles, total_cost,
-    // ae_status, rdo_status, rdo_remarks,
-    // approved_by, approved_date,
-    // payment_status, refund_status, booking_status, cdate
-    // )
-    // SELECT
-    // refid, applicant_name, mobile_number, applicant_address,
-    // event_id, event_date, no_of_days, total_poles, total_cost,
-    // ae_status, ?, ?, ?, NOW(),
-    // payment_status, refund_status, booking_status, NOW()
-    // FROM user_request_details
-    // WHERE refid = ?
-    // """;
-
-    // mysqlFlagPoleJdbcTemplate.update(historySql, status, remarks, gccUserId,
-    // refId);
-
-    // String updateSql = """
-    // UPDATE user_request_details
-    // SET
-    // rdo_status = ?,
-    // rdo_remarks = ?,
-    // approved_by = ?,
-    // rdo_updated_date = NOW()
-    // WHERE refid = ?
-    // """;
-
-    // return mysqlFlagPoleJdbcTemplate.update(updateSql, status, remarks,
-    // gccUserId, refId);
-    // }
-
-    // return 1;
-    // }
-
     public List<Map<String, Object>> getRdoApprovedRequestDetailsByUserLogin(
             String gccUserId,
             String startDate,
@@ -1195,11 +1083,28 @@ public class RdoService {
             throw new RuntimeException("Invalid gccUserId: " + gccUserId);
         }
 
-        /* 🔥 Resolve department */
-        Integer deptId = getDepartmentIdByUserId(gccUserId);
-        if (deptId == null) {
+        /* 🔥 Resolve department details and ZLSC status */
+        Map<String, Object> officerDetails = getOfficerDetailsByUserId(gccUserId);
+        if (officerDetails == null) {
             throw new RuntimeException("Department mapping missing for gccUserId: " + gccUserId);
         }
+        Integer deptId = (Integer) officerDetails.get("dpid");
+        Integer zlscMember = (Integer) officerDetails.get("zlsc_members");
+        boolean isZlscMember = (zlscMember != null && zlscMember == 1);
+        Integer dlcMember = (Integer) officerDetails.get("dlc_members");
+        boolean isDlcMember = (dlcMember != null && dlcMember == 1);
+        Integer droMember = (Integer) officerDetails.get("dro_member");
+        boolean isDro = (droMember != null && droMember == 1);
+
+        Integer gccUserQuestionsView = (Integer) officerDetails.get("gcc_user_id");
+
+        // System.out.println("gccUserQuestionsView: " + gccUserQuestionsView);
+
+        final List<Map<String, Object>> verificationQuestions = (isZlscMember || isDlcMember || isDro)
+                ? getVerificationQuestions(gccUserQuestionsView)
+                : null;
+
+        // System.out.println("verificationQuestions: " + verificationQuestions);
 
         /* 🔥 Resolve access */
         List<Map<String, Object>> access = getUserAccess(appUserId);
@@ -1237,16 +1142,26 @@ public class RdoService {
                         urd.rdo_status,
                         urd.rdo_remarks,
                         urd.no_of_days,
+                        urd.others_specify_statue_material,
+                        urd.place_of_erection,
+
+                        at.id AS application_type_id,
+                        at.type AS application_type_name,
+                        ao.option_name,
+                        it.installation_name,
 
                         sd.street_name,
                         sd.zone,
                         sd.ward,
                         sd.no_of_poles,
+                        sd.no_of_statue,
                         sd.street_cost,
                         sd.height,
 
                         fm.flag_material_name AS flag_material,
                         pm.pole_material_name AS pole_material,
+                        sm.statue_material_type,
+                        pdm.statue_pedestal_type AS pedestal_material,
 
                         urd.total_cost,
                         et.event_name,
@@ -1261,9 +1176,14 @@ public class RdoService {
                            ON urd.refid = sd.refid
                           AND sd.is_active = 1
                           AND sd.is_delete = 0
+                    LEFT JOIN application_type at ON urd.application_type = at.id
+                    LEFT JOIN application_option ao ON urd.application_option = ao.id
+                    LEFT JOIN installation_type it ON urd.installation_type = it.id
                     LEFT JOIN event_type et ON urd.event_id = et.id
                     LEFT JOIN flag_material fm ON sd.flag_material_id = fm.id
                     LEFT JOIN pole_material pm ON sd.pole_material_id = pm.id
+                    LEFT JOIN statue_material sm ON sd.statue_material_id = sm.id
+                    LEFT JOIN pedestal_material pdm ON sd.pedestal_material_id = pdm.id
                     WHERE ofb.dept_id = ?
                       AND ofb.status IN ('APPROVED','REJECTED')
                       AND ofb.is_active = 1
@@ -1333,7 +1253,21 @@ public class RdoService {
                 map.put("total_cost", row.get("total_cost"));
                 map.put("officer_status", row.get("officer_status"));
                 map.put("officer_remarks", row.get("officer_remarks"));
+                map.put("others_specify_statue_material", row.get("others_specify_statue_material"));
+                map.put("place_of_erection", row.get("place_of_erection"));
+                map.put("application_type_name", row.get("application_type_name"));
+                map.put("application_type_id", row.get("application_type_id"));
+                map.put("option_name", row.get("option_name"));
+                map.put("installation_name", row.get("installation_name"));
                 map.put("streets", new ArrayList<>());
+
+                // 🔥 Add verification questions for Permanent requests if user is ZLSC OR DRO
+                // member
+                if ((isZlscMember || isDlcMember || isDro)
+                        && "PERMANENT".equalsIgnoreCase((String) row.get("application_type_name"))) {
+                    map.put("verification_questions", verificationQuestions);
+                }
+
                 return map;
             });
 
@@ -1342,10 +1276,13 @@ public class RdoService {
             street.put("zone", row.get("zone"));
             street.put("ward", row.get("ward"));
             street.put("no_of_poles", row.get("no_of_poles"));
+            street.put("no_of_statue", row.get("no_of_statue"));
             street.put("height", row.get("height"));
             street.put("street_cost", row.get("street_cost"));
             street.put("flag_material", row.get("flag_material"));
             street.put("pole_material", row.get("pole_material"));
+            street.put("statue_material", row.get("statue_material_type"));
+            street.put("pedestal_material", row.get("pedestal_material"));
 
             ((List<Map<String, Object>>) request.get("streets")).add(street);
         }
@@ -1353,4 +1290,197 @@ public class RdoService {
         return new ArrayList<>(resultMap.values());
     }
 
+    public List<Map<String, Object>> getAdminReportDetails(
+            String gccUserId,
+            String startDate,
+            String endDate,
+            String status) {
+
+        if (!isAdminViewUser(gccUserId)) {
+            return new ArrayList<>();
+        }
+
+        StringBuilder sql = new StringBuilder("""
+                    SELECT
+                        urd.id,
+                        urd.refid,
+                        urd.applicant_name,
+                        urd.mobile_number,
+                        urd.applicant_address,
+                        urd.event_desc,
+                        urd.cdate,
+                        urd.event_date,
+                        urd.ae_status,
+                        urd.rdo_status,
+                        urd.rdo_remarks,
+                        urd.no_of_days,
+                        urd.others_specify_statue_material,
+                        urd.place_of_erection,
+
+                        at.id AS application_type_id,
+                        at.type AS application_type_name,
+                        ao.option_name,
+                        it.installation_name,
+
+                        sd.street_name,
+                        sd.zone,
+                        sd.ward,
+                        sd.no_of_poles,
+                        sd.no_of_statue,
+                        sd.street_cost,
+                        sd.height,
+
+                        fm.flag_material_name AS flag_material,
+                        pm.pole_material_name AS pole_material,
+                        sm.statue_material_type,
+                        pdm.statue_pedestal_type AS pedestal_material,
+
+                        urd.total_cost,
+                        et.event_name,
+                        dl.department_name,
+                        DATE_FORMAT(ofb.cdate, '%d-%m-%Y %h:%i %p') AS action_date,
+
+                        ofb.status   AS officer_status,
+                        ofb.remarks AS officer_remarks
+
+                    FROM user_request_details urd
+                    LEFT JOIN officer_feedback ofb
+                         ON urd.refid = ofb.refid
+                        AND ofb.is_active = 1
+                        AND ofb.is_delete = 0
+                    LEFT JOIN department_login dl
+                         ON ofb.dept_id = dl.dpid
+                    LEFT JOIN street_details sd
+                           ON urd.refid = sd.refid
+                          AND sd.is_active = 1
+                          AND sd.is_delete = 0
+                    LEFT JOIN application_type at ON urd.application_type = at.id
+                    LEFT JOIN application_option ao ON urd.application_option = ao.id
+                    LEFT JOIN installation_type it ON urd.installation_type = it.id
+                    LEFT JOIN event_type et ON urd.event_id = et.id
+                    LEFT JOIN flag_material fm ON sd.flag_material_id = fm.id
+                    LEFT JOIN pole_material pm ON sd.pole_material_id = pm.id
+                    LEFT JOIN statue_material sm ON sd.statue_material_id = sm.id
+                    LEFT JOIN pedestal_material pdm ON sd.pedestal_material_id = pdm.id
+                    WHERE 1 = 1
+                """);
+
+        List<Object> params = new ArrayList<>();
+
+        if (hasValue(status)) {
+            sql.append(" AND ofb.status = ? ");
+            params.add(status);
+        }
+
+        if (hasValue(startDate) && hasValue(endDate)) {
+            sql.append(" AND DATE(urd.event_date) BETWEEN ? AND ? ");
+            params.add(startDate);
+            params.add(endDate);
+        } else if (hasValue(startDate)) {
+            sql.append(" AND DATE(urd.event_date) = ? ");
+            params.add(startDate);
+        }
+
+        sql.append(" ORDER BY urd.cdate DESC, urd.refid ");
+
+        List<Map<String, Object>> rows = mysqlFlagPoleJdbcTemplate.queryForList(sql.toString(), params.toArray());
+
+        Map<String, Map<String, Object>> resultMap = new LinkedHashMap<>();
+
+        for (Map<String, Object> row : rows) {
+            String refid = (String) row.get("refid");
+
+            Map<String, Object> request = resultMap.computeIfAbsent(refid, k -> {
+                Map<String, Object> map = new LinkedHashMap<>();
+                map.put("refid", row.get("refid"));
+                map.put("applicant_name", row.get("applicant_name"));
+                map.put("mobile_number", row.get("mobile_number"));
+                map.put("applicant_address", row.get("applicant_address"));
+                map.put("event_desc", row.get("event_desc"));
+                map.put("cdate", row.get("cdate"));
+                map.put("event_date", row.get("event_date"));
+                map.put("ae_status", row.get("ae_status"));
+                map.put("rdo_status", row.get("rdo_status"));
+                map.put("rdo_remarks", row.get("rdo_remarks"));
+                map.put("no_of_days", row.get("no_of_days"));
+                map.put("event_name", row.get("event_name"));
+                map.put("total_cost", row.get("total_cost"));
+                map.put("others_specify_statue_material", row.get("others_specify_statue_material"));
+                map.put("place_of_erection", row.get("place_of_erection"));
+                map.put("application_type_name", row.get("application_type_name"));
+                map.put("application_type_id", row.get("application_type_id"));
+                map.put("option_name", row.get("option_name"));
+                map.put("installation_name", row.get("installation_name"));
+                map.put("streets", new ArrayList<>());
+                map.put("history", new ArrayList<>());
+                return map;
+            });
+
+            // Streets
+            List<Map<String, Object>> streets = (List<Map<String, Object>>) request.get("streets");
+            String streetName = (String) row.get("street_name");
+            if (streetName != null) {
+                boolean exists = streets.stream().anyMatch(s -> streetName.equals(s.get("street_name")));
+                if (!exists) {
+                    Map<String, Object> sObj = new LinkedHashMap<>();
+                    sObj.put("street_name", streetName);
+                    sObj.put("zone", row.get("zone"));
+                    sObj.put("ward", row.get("ward"));
+                    sObj.put("no_of_poles", row.get("no_of_poles"));
+                    sObj.put("no_of_statue", row.get("no_of_statue"));
+                    sObj.put("height", row.get("height"));
+                    sObj.put("street_cost", row.get("street_cost"));
+                    sObj.put("flag_material", row.get("flag_material"));
+                    sObj.put("pole_material", row.get("pole_material"));
+                    sObj.put("statue_material", row.get("statue_material_type"));
+                    sObj.put("pedestal_material", row.get("pedestal_material"));
+                    streets.add(sObj);
+                }
+            }
+
+            // History
+            List<Map<String, Object>> history = (List<Map<String, Object>>) request.get("history");
+            String deptName = (String) row.get("department_name");
+            String actionDate = (String) row.get("action_date");
+            if (deptName != null && actionDate != null) {
+                boolean exists = history.stream().anyMatch(
+                        h -> deptName.equals(h.get("department_name")) && actionDate.equals(h.get("action_date")));
+                if (!exists) {
+                    Map<String, Object> hObj = new LinkedHashMap<>();
+                    hObj.put("department_name", deptName);
+                    hObj.put("status", row.get("officer_status"));
+                    hObj.put("remarks", row.get("officer_remarks"));
+                    hObj.put("action_date", actionDate);
+                    history.add(hObj);
+                }
+            }
+        }
+        return new ArrayList<>(resultMap.values());
+    }
+
+    public Map<String, List<String>> getMapOfZonalOfficersByZone() {
+        String sql = """
+                    SELECT lmu.zone, u.userid
+                    FROM login_mapping_user lmu
+                    JOIN appusers u ON lmu.appuser_id = u.id
+                    WHERE lmu.zone IS NOT NULL AND lmu.zone <> ''
+                """;
+
+        // We can't use queryForList to directly get a Map<String, List<String>> easily
+        // with standard JDBC template
+        // So we fetch list of maps and process it.
+        List<Map<String, Object>> rows = mysqlAppJdbcTemplate.queryForList(sql);
+
+        Map<String, List<String>> result = new LinkedHashMap<>();
+
+        for (Map<String, Object> row : rows) {
+            String z = (String) row.get("zone");
+            // userid in appusers might be integer or string, safely to string
+            String uid = String.valueOf(row.get("userid"));
+
+            result.computeIfAbsent(z, k -> new ArrayList<>()).add(uid);
+        }
+
+        return result;
+    }
 }
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 27c5409..78455b5 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -2,4 +2,7 @@ assets.base-url=/assets/
 
 fileBaseUrl=http://localhost:8061
 
-#fileBaseUrl = D:/Projects/Election_Project/election_v1/gcc_election_uploads
\ No newline at end of file
+fileBaseUrlImages=http://localhost:8061
+#fileBaseUrlImages=https://gccservices.in
+
+#fileBaseUrl = D:/Projects/Election_Project/election_v1/gcc_election_uploads    
\ No newline at end of file
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 84a87c5..cde6d06 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -1,3 +1,5 @@
 assets.base-url=/flagpoles/assets/
 
-fileBaseUrl=https://gccservices.in/flagpoles
\ No newline at end of file
+fileBaseUrl=https://gccservices.in/flagpoles
+
+fileBaseUrlImages=https://gccservices.in
diff --git a/src/main/resources/templates/modules/flagpole/adminreports.html b/src/main/resources/templates/modules/flagpole/adminreports.html
new file mode 100644
index 0000000..ada3984
--- /dev/null
+++ b/src/main/resources/templates/modules/flagpole/adminreports.html
@@ -0,0 +1,751 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="~{fragments/modules/base/head :: head}"></head>
+<style>
+    .width1 {
+        width: 120px;
+    }
+
+    .width2 {
+        width: 150px;
+    }
+
+    .modal-label {
+        font-weight: 600;
+        color: #333;
+    }
+
+    .modal-value {
+        color: #444;
+    }
+
+    .modal-section-title {
+        font-size: 1.2rem;
+        font-weight: bold;
+        margin-top: 20px;
+        margin-bottom: 10px;
+        border-bottom: 2px solid #dee2e6;
+        padding-bottom: 5px;
+    }
+
+
+    .modal-title-big {
+        font-size: 20px;
+        font-weight: 700;
+    }
+
+    .modal-subtext {
+        color: #b4c5d3;
+        font-size: 13px;
+    }
+
+    .card-section {
+        background: white;
+        border-radius: 10px;
+        padding: 20px;
+        margin-bottom: 25px;
+        border: 1px solid #eee;
+    }
+
+    .section-title {
+        font-weight: 700;
+        color: #333;
+        margin-bottom: 15px;
+        font-size: 16px;
+    }
+
+    .label-text {
+        font-size: 13px;
+        color: #6c757d;
+    }
+
+    .value-text {
+        font-size: 15px;
+        font-weight: 600;
+        color: #333;
+    }
+
+    .info-block {
+        display: flex;
+        flex-direction: column;
+    }
+
+
+    .badge-status {
+        background: #2dce89;
+        color: #212121;
+        padding: 6px 10px;
+        border-radius: 5px;
+        font-size: 13px;
+
+    }
+
+    .btn-big {
+        padding: 12px 25px;
+        border-radius: 8px;
+        width: 200px;
+    }
+
+    .rdo-box {
+        border: 1px solid #eee;
+        border-radius: 10px;
+        padding: 20px;
+    }
+</style>
+
+<body>
+
+    <div class="wrapper">
+        <!-- header top menu Start -->
+        <header th:replace="~{fragments/modules/base/header :: header}"></header>
+        <!-- header top menu end -->
+        <div class="page-wrap">
+            <!--=============== Left Menu side Start ================-->
+            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
+            <!--=============== Left side End ================-->
+            <div class="main-content">
+                <div class="container-fluid">
+                    <div class="page-header">
+                        <div class="row align-items-end">
+                            <div class="col-lg-6">
+                                <div class="page-header-title">
+                                    <i class="fa fa-list-alt bg-blue"></i>
+                                    <div class="d-inline">
+                                        <h5>Admin Reports</h5>
+                                        <span>Flag Pole Admin Reports</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-lg-6">
+                                <nav class="breadcrumb-container" aria-label="breadcrumb">
+                                    <ol class="breadcrumb">
+                                        <li class="breadcrumb-item">
+                                            <a href="/flagpoles/index"><i class="ik ik-home"></i></a>
+                                        </li>
+                                        <li class="breadcrumb-item" aria-current="page">Flag Pole Admin Reports</li>
+                                        <li class="breadcrumb-item active" aria-current="page">Admin Reports</li>
+                                    </ol>
+                                </nav>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="row mt-4">
+
+                        <div class="col-md-12">
+                            <div class="card">
+                                <div class="card-header d-flex justify-content-between align-items-center fw-bold">
+                                    <h3 class="mb-0">Temporary Flag Poles - Admin Reports : <span
+                                            th:text="${officer_name}"></span></h3>
+                                    <input type="hidden" id="userName" th:value="${officer_name}">
+                                    <input type="hidden" id="loginuserid" th:value="${LoginUserId}">
+
+                                </div>
+
+                                <div class="row mt-3 ml-2">
+                                    <div class="col-md-3">
+                                        <label for="startDate" class="form-label" style="font-size: medium;">From
+                                            Date:</label>
+                                        <input type="date" id="startDate" class="form-control" placeholder="Start Date">
+                                    </div>
+                                    <div class="col-md-3">
+                                        <label for="endDate" class="form-label" style="font-size: medium;">To
+                                            Date:</label>
+                                        <input type="date" id="endDate" class="form-control" placeholder="End Date">
+                                    </div>
+                                    <div class="col-md-3">
+                                        <label class="form-label">Status:</label>
+                                        <select id="statusFilter" class="form-control">
+                                            <option value="">All</option>
+                                            <option value="APPROVED">Approved</option>
+                                            <option value="REJECTED">Rejected</option>
+                                        </select>
+                                    </div>
+                                    <div class="col-md-3" style="margin-top: 30px;">
+                                        <button id="searchBtn" class="btn btn-primary">Search</button>
+                                        <button id="resetBtn" class="btn btn-secondary">Reset</button>
+                                    </div>
+                                </div>
+
+                                <div class="card-body">
+                                    <div>
+                                        <div class="row mt-2">
+
+
+                                            <div class="col-xl-3 col-md-3 col-sm-12">
+                                                <div class="card card-box p-4">
+                                                    <h6 class="text-facebook mb-20 mt-2 text-center fw-bold"><b>Total
+                                                            Request</b>
+                                                    </h6>
+                                                    <h4 class="text-twitter fw-700 text-center" id="totalrequest">10
+                                                    </h4>
+                                                </div>
+                                            </div>
+                                            <div class="col-xl-3 col-md-3 col-sm-12" style="display: none;">
+                                                <div class="card card-box p-4">
+                                                    <h6 class="text-facebook mb-20 mt-2 text-center"><b>Pending Decision
+                                                        </b></h6>
+                                                    <h4 class="text-twitter fw-700 text-center" id="pendingdecision">9
+                                                    </h4>
+                                                </div>
+                                            </div>
+                                            <div class="col-xl-3 col-md-3 col-sm-12">
+                                                <div class="card card-box p-4">
+                                                    <h6 class="text-facebook mb-20 mt-2 text-center"><b>Approved</b>
+                                                    </h6>
+                                                    <h4 class="text-twitter fw-700 text-center" id="approved">1</h4>
+                                                </div>
+                                            </div>
+                                            <div class="col-xl-3 col-md-3 col-sm-12">
+                                                <div class="card card-box p-4">
+                                                    <h6 class="text-facebook mb-20 mt-2 text-center"><b>Rejected</b>
+                                                    </h6>
+                                                    <h4 class="text-twitter fw-700 text-center" id="rejected">0</h4>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div>
+                                            <table id="QaqcDatatable"
+                                                class="table table-striped table-bordered table-hover dataTable"
+                                                role="grid">
+                                                <thead class="thead-dark">
+                                                    <tr role="row">
+                                                        <th class="text-center">S.No</th>
+                                                        <th class="text-center no-sort">Applicant Name</th>
+                                                        <th class="text-center">RequestId</th>
+                                                        <th class="text-center">Application Type</th>
+                                                        <th class="text-center">Zone/Ward</th>
+                                                        <th class="text-center">Event Type</th>
+                                                        <th class="text-center">Event Date</th>
+                                                        <th class="text-center">Total Cost</th>
+                                                        <th class="text-center">Status</th>
+                                                        <th class="text-center">Action</th>
+
+                                                    </tr>
+
+                                                </thead>
+                                                <tbody>
+
+                                                </tbody>
+                                            </table>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+            <div id="pageLoader"
+                style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
+                <div style="position: relative; top: 50%; transform: translateY(-50%);">
+                    <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
+                        <span class="sr-only">Loading...</span>
+                    </div>
+                    <!-- Add the 'Please wait' text below the spinner -->
+                    <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
+                </div>
+            </div>
+
+            <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
+
+            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+        </div>
+    </div>
+
+
+    <!-- Details Modal -->
+    <div class="modal fade" id="detailsModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-xl modal-dialog-scrollable">
+            <div class="modal-content">
+
+                <div class="modal-header" style="background:#2f3e54; color:white;">
+                    <div>
+                        <h4 class="modal-title-big" id="modalTitle"></h4>
+                        <div id="modalSubTitle" class="modal-subtext"></div>
+                    </div>
+
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                </div>
+
+                <div class="modal-body">
+
+                    <div id="modalContent"></div>
+
+                    <div class="text-center mt-4">
+                        <button type="button" class="btn btn-primary btn-big" data-dismiss="modal"
+                            style="background:#2f3e54;">Close</button>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+
+
+
+    <script th:replace="~{fragments/modules/base/script :: script}"></script>
+    <script type="text/javascript">
+
+        let table;
+
+        $(document).ready(function () {
+            loadTable();
+
+            $("#searchBtn").on("click", loadTable);
+
+            $("#resetBtn").on("click", function () {
+                $("#startDate").val("");
+                $("#endDate").val("");
+                $("#statusFilter").val("");
+                loadTable();
+            });
+        });
+
+        function loadTable() {
+
+            //let officer_name = $("#userName").val();
+            let gccUserId = $("#loginuserid").val();
+            let startDate = $("#startDate").val();
+            let endDate = $("#endDate").val();
+            let status = $("#statusFilter").val();
+
+            console.log("gccuserid", gccUserId);
+
+            if ($.fn.DataTable.isDataTable('#QaqcDatatable')) {
+                $('#QaqcDatatable').DataTable().clear().destroy();
+            }
+
+            table = $('#QaqcDatatable').DataTable({
+                processing: true,
+                responsive: true,
+                scrollY: '50vh',
+                dom: 'Bfrtip',
+
+                ajax: {
+                    url: "/flagpoles/api/flagpoleregistration/getAdminReports",
+                    type: "GET",
+                    data: {
+                        gccUserId: gccUserId,
+                        startDate: startDate,
+                        endDate: endDate,
+                        status: status
+                    },
+                    dataSrc: function (json) {
+
+                        const data = json.data || [];
+
+                        // 🔹 Dashboard counts
+                        let pending = 0, approved = 0, rejected = 0;
+
+                        data.forEach(r => {
+                            let status = r.history && r.history.length > 0
+                                ? r.history[r.history.length - 1].status
+                                : null;
+
+
+                            if (!status) pending++;
+                            else if (status === 'APPROVED') approved++;
+                            else if (status === 'REJECTED') rejected++;
+                        });
+
+                        // data.forEach(r => {
+                        //     if (!r.rdo_status) pending++;
+                        //     else if (r.rdo_status === 'APPROVED') approved++;
+                        //     else if (r.rdo_status === 'REJECTED') rejected++;
+                        // });
+
+                        $("#totalrequest").text(data.length);
+                        $("#pendingdecision").text(pending);
+                        $("#approved").text(approved);
+                        $("#rejected").text(rejected);
+
+                        return data; // ✅ already unique per refid
+                    }
+                },
+
+                columns: [
+                    {
+                        data: null,
+                        className: "text-center",
+                        render: (d, t, r, m) => m.row + 1
+                    },
+                    {
+                        data: "applicant_name",
+                        className: "text-center"
+                    },
+                    {
+                        data: "refid",
+                        className: "text-center"
+                    },
+                    {
+                        data: "application_type_name",
+                        className: "text-center",
+                        render: d =>
+                            d === "TEMPORARY"
+                                ? `<span class="badge bg-info text-white">Temporary</span>`
+                                : `<span class="badge bg-primary text-white">Permanent</span>`
+                    },
+                    {
+                        data: null,
+                        className: "text-center",
+                        render: row => {
+                            if (!row.streets || row.streets.length === 0) return "-";
+                            return `${row.streets[0].zone} / ${row.streets[0].ward}`;
+                        }
+                    },
+                    {
+                        data: "event_name",
+                        className: "text-center",
+                        render: (d, t, r) =>
+                            r.application_type_name === "PERMANENT"
+                                ? `<span class="text-muted">NA</span>`
+                                : (d || "NA")
+                    },
+                    {
+                        data: "event_date",
+                        className: "text-center",
+                        render: (d, t, r) => {
+                            if (r.application_type_name === "PERMANENT") return "NA";
+                            return d ? new Date(d).toLocaleDateString("en-GB") : "NA";
+                        }
+                    },
+                    {
+                        data: "total_cost",
+                        className: "text-center",
+                        render: (d, t, r) => {
+                            if (r.application_type_name === "PERMANENT") return "NA";
+                            return d ? d.toLocaleString("en-GB") : "NA";
+                        }
+                    },
+                    // {
+                    //     data: "rdo_status",
+                    //     className: "text-center",
+                    //     render: d => {
+                    //         if (!d)
+                    //             return `<span class="badge bg-warning text-dark">Pending</span>`;
+                    //         if (d === 'APPROVED')
+                    //             return `<span class="badge bg-success">Approved</span>`;
+                    //         return `<span class="badge bg-danger">Rejected</span>`;
+                    //     }
+                    // },
+                    {
+                        data: null,
+                        className: "text-center",
+                        render: row => {
+
+                            let status = row.history && row.history.length > 0
+                                ? row.history[row.history.length - 1].status
+                                : null;
+
+
+                            if (!status)
+                                return `<span class="badge bg-warning text-white">Pending</span>`;
+                            if (status === 'APPROVED')
+                                return `<span class="badge bg-success text-white">Approved</span>`;
+                            return `<span class="badge bg-danger text-white">Rejected</span>`;
+                        }
+                    },
+
+                    // {
+                    //     data: "remarks",
+                    //     className: "text-center"
+                    // },
+                    // {
+                    //     data: null,
+                    //     className: "text-center",
+                    //     render: function (row) {
+
+                    //         if (!row.history || row.history.length === 0)
+                    //             return "-";
+
+                    //         // history already filtered by backend for login dept
+                    //         return row.history[0].remarks || "-";
+                    //     }
+                    // },
+
+                    {
+                        data: null,
+                        className: "text-center",
+                        render: row =>
+                            `<button class="btn btn-primary btn-sm viewBtn"
+                        data-refid="${row.refid}">
+                        View
+                    </button>`
+                    }
+                ]
+            });
+        }
+
+
+
+        // Destroy previous instance if exists
+        if ($.fn.DataTable.isDataTable('#QaqcDatatable')) {
+            $('#QaqcDatatable').DataTable().clear().destroy();
+        }
+
+
+
+
+        // $('#QaqcDatatable').on("click", ".viewBtn", function () {
+
+        //     // 🔹 Get row data directly from DataTable
+        //     const rowData = table.row($(this).closest('tr')).data();
+
+        //     if (!rowData) {
+        //         alert("No details found");
+        //         return;
+        //     }
+
+        //     populateModal(rowData);
+        //     $("#detailsModal").modal("show");
+        // });
+
+        $('#QaqcDatatable').on("click", ".viewBtn", function () {
+
+            let tr = $(this).closest('tr');
+
+            // ✅ If responsive child row, get previous row
+            if (tr.hasClass('child')) {
+                tr = tr.prev();
+            }
+
+            const rowData = table.row(tr).data();
+
+            if (!rowData) {
+                alert("No details found");
+                return;
+            }
+
+            populateModal(rowData);
+            $("#detailsModal").modal("show");
+        });
+
+
+        // -----------------------------
+        // VIEW BUTTON → OPEN MODAL
+        // -----------------------------
+        function populateModal(record) {
+
+            // HEADER
+            $("#modalTitle").html(`Application Details - ${record.applicant_name}`);
+            $("#modalSubTitle").html(
+                `Ref ID: ${record.refid} - ${record.streets.length} Streets`
+            );
+
+            $("#detailsModal").data("refid", record.refid);
+
+            // 🔹 Streets
+            let streetHtml = "";
+
+            record.streets.forEach((s, index) => {
+                const isStatue = s.no_of_statue > 0;
+                streetHtml += `
+        <div class="card-section">
+            <div class="section-title">Street ${index + 1}</div>
+
+            <div class="row mb-2">
+                <div class="col-md-4">
+                    <div class="label-text">Street Name</div>
+                    <div class="value-text">${s.street_name || '-'}</div>
+                </div>
+                <div class="col-md-4">
+                    <div class="label-text">Zone / Ward</div>
+                    <div class="value-text">${s.zone} / ${s.ward}</div>
+                </div>
+
+                ${isStatue ? `
+                <div class="col-md-4">
+                    <div class="label-text">No. of Statue</div>
+                    <div class="value-text">${s.no_of_statue}</div>
+                </div>
+                <div class="col-md-4">
+                    <div class="label-text">Statue Material</div>
+                    <div class="value-text">
+                        ${s.statue_material || '-'} 
+                        ${(s.statue_material || '').toLowerCase() === 'others'
+                            ? `(${record.others_specify_statue_material || '-'})`
+                            : ''}
+                    </div>
+                </div>
+                <div class="col-md-4">
+                    <div class="label-text">Pedestal Material</div>
+                    <div class="value-text">${s.pedestal_material || '-'}</div>
+                </div>
+                ` : `
+                <div class="col-md-4">
+                    <div class="label-text">No. of Poles</div>
+                    <div class="value-text">${s.no_of_poles}</div>
+                </div>
+                <div class="col-md-4">
+                    <div class="label-text">Flag Material</div>
+                    <div class="value-text">${s.flag_material || '-'}</div>
+                </div>
+                <div class="col-md-4">
+                    <div class="label-text">Pole Material</div>
+                    <div class="value-text">${s.pole_material || '-'}</div>
+                </div>
+                `}
+
+                <div class="col-md-4">
+                    <div class="label-text">Height</div>
+                    <div class="value-text">${s.height || '-'}</div>
+                </div>
+                
+            </div>
+            
+        </div>`;
+            });
+
+
+            let historyHtml = "";
+
+            if (record.history && record.history.length > 0) {
+
+                historyHtml += `
+    <div class="card-section">
+        <div class="section-title">Application History</div>
+    `;
+
+                record.history.forEach((h, index) => {
+                    historyHtml += `
+        <div class="row mb-2 border-bottom pb-2">
+            <div class="col-md-3">
+                <div class="label-text">Action Date</div>
+                <div class="value-text">${h.action_date}</div>
+            </div>
+
+            <div class="col-md-3">
+                <div class="label-text">Department</div>
+                <div class="value-text">${h.department_name}</div>
+            </div>
+
+
+            <div class="col-md-3">
+                <div class="label-text">Status</div>
+                <div class="value-text">${h.status}</div>
+            </div>
+
+        
+
+            ${h.remarks ? `
+            <div class="col-md-3">
+                <div class="label-text">Remarks</div>
+                <div class="value-text">${h.remarks}</div>
+            </div>` : ""}
+        </div>
+        `;
+                });
+
+                historyHtml += `</div>`;
+            }
+
+            const isPermanent = record.application_type_name === "PERMANENT";
+
+            let html = `
+    <!-- APPLICANT INFO -->
+    <div class="card-section">
+        <div class="section-title">Applicant Information</div>
+
+        <div class="row mb-2">
+            <div class="col-md-6">
+                <div class="label-text">Applicant Name</div>
+                <div class="value-text">${record.applicant_name}</div>
+            </div>
+            <div class="col-md-6">
+                <div class="label-text">Mobile Number</div>
+                <div class="value-text">${record.mobile_number}</div>
+            </div>
+        </div>
+
+        <div class="row mb-2">
+            ${!isPermanent ? `
+            <div class="col-md-6">
+                <div class="label-text">Event Type</div>
+                <div class="value-text">${record.event_name}</div>
+            </div>
+            <div class="col-md-6">
+                <div class="label-text">Event Date</div>
+                <div class="value-text">
+                    ${new Date(record.event_date).toLocaleDateString("en-GB")}
+                </div>
+            </div>
+            ` : ""}
+
+            <div class="col-md-6">
+                <div class="label-text">Application Type</div>
+                <div class="value-text">${record.application_type_name}</div>
+            </div>
+
+            <div class="col-md-6">
+                <div class="label-text">Installation Type</div>
+                <div class="value-text">${record.installation_name || '-'}</div>
+            </div>
+
+            <div class="col-md-6">
+                <div class="label-text">Option</div>
+                <div class="value-text">${record.option_name || '-'}</div>
+            </div>
+
+            <div class="col-md-6">
+                <div class="label-text">Address</div>
+                <div class="value-text">
+                    ${record.applicant_address}
+                </div>
+            </div>
+
+            <div class="col-md-6">
+                <div class="label-text">Place of Erection</div>
+                <div class="value-text">
+                    ${record.place_of_erection || '-'}
+                </div>
+            </div>
+
+            ${!isPermanent ? `
+            <div class="col-md-6">
+                <div class="label-text">Total Cost</div>
+                <div class="value-text">
+                    ${record.total_cost.toLocaleString("en-GB")}
+                </div>
+            </div>
+             <div class="col-md-6">
+                    <div class="label-text">No. of Days</div>
+                    <div class="value-text">${record.no_of_days}</div>
+            </div>
+              <div class="col-md-6">
+                    <div class="label-text">Event Description</div>
+                    <div class="value-text">${record.event_desc}</div>
+            </div>
+            ` : ""}
+        </div>
+        <div class="row mb-2">
+            <div class="col-md-6">
+                <div class="label-text">Applied Date</div>
+                <div class="value-text">${record.cdate}</div>
+            </div>
+        </div>
+    </div>
+
+    ${streetHtml}
+    ${historyHtml}
+    `;
+
+            $("#modalContent").html(html);
+        }
+
+
+
+
+
+
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html b/src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html
index b6abd82..a59b166 100644
--- a/src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html
+++ b/src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html
@@ -217,6 +217,7 @@
                                                         <th class="text-center">S.No</th>
                                                         <th class="text-center no-sort">Applicant Name</th>
                                                         <th class="text-center">RequestId</th>
+                                                        <th class="text-center">Application Type</th>
                                                         <th class="text-center">Zone/Ward</th>
                                                         <th class="text-center">Event Type</th>
                                                         <th class="text-center">Event Date</th>
@@ -389,6 +390,14 @@
                         data: "refid",
                         className: "text-center"
                     },
+                    {
+                        data: "application_type_name",
+                        className: "text-center",
+                        render: d =>
+                            d === "TEMPORARY"
+                                ? `<span class="badge bg-info text-white">Temporary</span>`
+                                : `<span class="badge bg-primary text-white">Permanent</span>`
+                    },
                     {
                         data: null,
                         className: "text-center",
@@ -399,17 +408,27 @@
                     },
                     {
                         data: "event_name",
-                        className: "text-center"
+                        className: "text-center",
+                        render: (d, t, r) =>
+                            r.application_type_name === "PERMANENT"
+                                ? `<span class="text-muted">NA</span>`
+                                : (d || "NA")
                     },
                     {
                         data: "event_date",
                         className: "text-center",
-                        render: d => new Date(d).toLocaleDateString("en-GB")
+                        render: (d, t, r) => {
+                            if (r.application_type_name === "PERMANENT") return "NA";
+                            return d ? new Date(d).toLocaleDateString("en-GB") : "NA";
+                        }
                     },
                     {
                         data: "total_cost",
                         className: "text-center",
-                        render: d => d.toLocaleString("en-GB")
+                        render: (d, t, r) => {
+                            if (r.application_type_name === "PERMANENT") return "NA";
+                            return d ? d.toLocaleString("en-GB") : "NA";
+                        }
                     },
                     // {
                     //     data: "rdo_status",
@@ -433,10 +452,10 @@
 
 
                             if (!status)
-                                return `<span class="badge bg-warning text-dark">Pending</span>`;
+                                return `<span class="badge bg-warning text-white">Pending</span>`;
                             if (status === 'APPROVED')
-                                return `<span class="badge bg-success">Approved</span>`;
-                            return `<span class="badge bg-danger">Rejected</span>`;
+                                return `<span class="badge bg-success text-white">Approved</span>`;
+                            return `<span class="badge bg-danger text-white">Rejected</span>`;
                         }
                     },
 
@@ -532,6 +551,7 @@
             let streetHtml = "";
 
             record.streets.forEach((s, index) => {
+                const isStatue = s.no_of_statue > 0;
                 streetHtml += `
         <div class="card-section">
             <div class="section-title">Street ${index + 1}</div>
@@ -539,40 +559,52 @@
             <div class="row mb-2">
                 <div class="col-md-4">
                     <div class="label-text">Street Name</div>
-                    <div class="value-text">${s.street_name}</div>
+                    <div class="value-text">${s.street_name || '-'}</div>
                 </div>
                 <div class="col-md-4">
-                    <div class="label-text">Zone</div>
-                    <div class="value-text">${s.zone}</div>
+                    <div class="label-text">Zone / Ward</div>
+                    <div class="value-text">${s.zone} / ${s.ward}</div>
                 </div>
+
+                ${isStatue ? `
                 <div class="col-md-4">
-                    <div class="label-text">Ward</div>
-                    <div class="value-text">${s.ward}</div>
+                    <div class="label-text">No. of Statue</div>
+                    <div class="value-text">${s.no_of_statue}</div>
                 </div>
                 <div class="col-md-4">
-                    <div class="label-text">No. of Poles</div>
-                    <div class="value-text">${s.no_of_poles}</div>
+                    <div class="label-text">Statue Material</div>
+                    <div class="value-text">
+                        ${s.statue_material || '-'} 
+                        ${(s.statue_material || '').toLowerCase() === 'others'
+                            ? `(${record.others_specify_statue_material || '-'})`
+                            : ''}
+                    </div>
                 </div>
- 
-    
                 <div class="col-md-4">
-                    <div class="label-text">Height</div>
-                    <div class="value-text">${s.height}</div>
+                    <div class="label-text">Pedestal Material</div>
+                    <div class="value-text">${s.pedestal_material || '-'}</div>
+                </div>
+                ` : `
+                <div class="col-md-4">
+                    <div class="label-text">No. of Poles</div>
+                    <div class="value-text">${s.no_of_poles}</div>
                 </div>
-
                 <div class="col-md-4">
                     <div class="label-text">Flag Material</div>
-                    <div class="value-text">${s.flag_material}</div>
+                    <div class="value-text">${s.flag_material || '-'}</div>
                 </div>
-             
                 <div class="col-md-4">
                     <div class="label-text">Pole Material</div>
-                    <div class="value-text">${s.pole_material}</div>
+                    <div class="value-text">${s.pole_material || '-'}</div>
                 </div>
-                
-            </div>
+                `}
 
+                <div class="col-md-4">
+                    <div class="label-text">Height</div>
+                    <div class="value-text">${s.height || '-'}</div>
+                </div>
                 
+            </div>
             
         </div>`;
             });
@@ -620,6 +652,8 @@
                 historyHtml += `</div>`;
             }
 
+            const isPermanent = record.application_type_name === "PERMANENT";
+
             let html = `
     <!-- APPLICANT INFO -->
     <div class="card-section">
@@ -637,6 +671,7 @@
         </div>
 
         <div class="row mb-2">
+            ${!isPermanent ? `
             <div class="col-md-6">
                 <div class="label-text">Event Type</div>
                 <div class="value-text">${record.event_name}</div>
@@ -647,12 +682,38 @@
                     ${new Date(record.event_date).toLocaleDateString("en-GB")}
                 </div>
             </div>
+            ` : ""}
+
+            <div class="col-md-6">
+                <div class="label-text">Application Type</div>
+                <div class="value-text">${record.application_type_name}</div>
+            </div>
+
+            <div class="col-md-6">
+                <div class="label-text">Installation Type</div>
+                <div class="value-text">${record.installation_name || '-'}</div>
+            </div>
+
+            <div class="col-md-6">
+                <div class="label-text">Option</div>
+                <div class="value-text">${record.option_name || '-'}</div>
+            </div>
+
             <div class="col-md-6">
                 <div class="label-text">Address</div>
                 <div class="value-text">
                     ${record.applicant_address}
                 </div>
             </div>
+
+            <div class="col-md-6">
+                <div class="label-text">Place of Erection</div>
+                <div class="value-text">
+                    ${record.place_of_erection || '-'}
+                </div>
+            </div>
+
+            ${!isPermanent ? `
             <div class="col-md-6">
                 <div class="label-text">Total Cost</div>
                 <div class="value-text">
@@ -663,10 +724,11 @@
                     <div class="label-text">No. of Days</div>
                     <div class="value-text">${record.no_of_days}</div>
             </div>
-             <div class="col-md-6">
+              <div class="col-md-6">
                     <div class="label-text">Event Description</div>
                     <div class="value-text">${record.event_desc}</div>
             </div>
+            ` : ""}
         </div>
         <div class="row mb-2">
             <div class="col-md-6">
diff --git a/src/main/resources/templates/modules/flagpole/requestlist.html b/src/main/resources/templates/modules/flagpole/requestlist.html
index 709535e..053406a 100644
--- a/src/main/resources/templates/modules/flagpole/requestlist.html
+++ b/src/main/resources/templates/modules/flagpole/requestlist.html
@@ -92,6 +92,21 @@
         border-radius: 10px;
         padding: 20px;
     }
+
+    .doc-box {
+        width: 180px;
+    }
+
+    .doc-title {
+        font-weight: 600;
+        margin-bottom: 6px;
+    }
+
+    .doc-thumb {
+        height: 150px;
+        object-fit: cover;
+        cursor: pointer;
+    }
 </style>
 
 <body>
@@ -142,6 +157,9 @@
                                     <input type="hidden" id="loginuserid" th:value="${LoginUserId}">
                                 </div>
 
+
+
+
                                 <div class="row mt-3 ml-2">
                                     <div class="col-md-3">
                                         <label for="startDate" class="form-label" style="font-size: medium;">From
@@ -206,6 +224,7 @@
                                                         <th class="text-center">S.No</th>
                                                         <th class="text-center no-sort">Applicant Name</th>
                                                         <th class="text-center">RequestId</th>
+                                                        <th class="text-center">Application Type</th>
                                                         <th class="text-center">Zone/Ward</th>
                                                         <th class="text-center">Event Type</th>
                                                         <th class="text-center">Event Date</th>
@@ -278,12 +297,13 @@
 
 
 
-    <div class="modal fade" id="imagePreviewModal" tabindex="-1">
+    <div class="modal fade" id="imagePreviewModal" tabindex="-1" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title">Document Preview</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
                 </div>
                 <div class="modal-body text-center">
                     <img id="previewImage" class="img-fluid">
@@ -297,7 +317,7 @@
     <script th:replace="~{fragments/modules/base/script :: script}"></script>
     <script type="text/javascript">
 
-
+        let selectedApplicationType = "";   // 1 TEMP , 2 PERM , empty = ALL
         let table;
 
         $(document).ready(function () {
@@ -310,6 +330,16 @@
                 $("#endDate").val("");
                 loadTable();
             });
+
+            $("#allBtn").click(function () {
+                selectedApplicationType = "";
+                loadTable();
+            });
+
+            $("#tempBtn,#permBtn").click(function () {
+                selectedApplicationType = $(this).data("type");
+                loadTable();
+            });
         });
 
         $(document).on("click", ".zoom-img", function () {
@@ -454,7 +484,8 @@
                     data: {
                         gccUserId: gccUserId,
                         startDate: startDate,
-                        endDate: endDate
+                        endDate: endDate,
+                        applicationType: selectedApplicationType
                     },
                     dataSrc: function (json) {
 
@@ -492,24 +523,47 @@
                     { data: null, render: (d, t, r, m) => m.row + 1, className: "text-center" },
                     { data: "applicant_name", className: "text-center" },
                     { data: "refid", className: "text-center" },
+                    // 🔥 Application Type
+                    {
+                        data: "application_type_name",
+                        className: "text-center",
+                        render: d =>
+                            d === "TEMPORARY"
+                                ? `<span class="badge bg-info text-white">Temporary</span>`
+                                : `<span class="badge bg-primary text-white">Permanent</span>`
+                    },
                     {
                         data: null,
                         className: "text-center",
                         render: r =>
                             r.streets?.length
                                 ? `${r.streets[0].zone} / ${r.streets[0].ward}`
-                                : "-"
+                                : "NA"
+                    },
+                    // 🔥 Event Type
+                    {
+                        data: "event_name",
+                        className: "text-center",
+                        render: (d, t, r) =>
+                            r.application_type_name === "PERMANENT"
+                                ? `<span class="text-muted">NA</span>`
+                                : (d || "NA")
                     },
-                    { data: "event_name", className: "text-center" },
                     {
                         data: "event_date",
                         className: "text-center",
-                        render: d => new Date(d).toLocaleDateString("en-GB")
+                        render: (d, t, r) => {
+                            if (r.application_type_name === "PERMANENT") return "NA";
+                            return d ? new Date(d).toLocaleDateString("en-GB") : "NA";
+                        }
                     },
                     {
                         data: "total_cost",
                         className: "text-center",
-                        render: d => d.toLocaleString("en-GB")
+                        render: (d, t, r) => {
+                            if (r.application_type_name === "PERMANENT") return "NA";
+                            return d ? d.toLocaleString("en-GB") : "NA";
+                        }
                     },
                     // {
                     //     data: "rdo_status",
@@ -529,11 +583,11 @@
                             const status = r.final_status;
 
                             if (!status)
-                                return `<span class="badge bg-warning text-dark">Pending</span>`;
+                                return `<span class="badge bg-warning text-white">Pending</span>`;
                             else if (status === 'APPROVED')
-                                return `<span class="badge bg-success">Approved</span>`;
+                                return `<span class="badge bg-success text-white">Approved</span>`;
                             else
-                                return `<span class="badge bg-danger">Rejected</span>`;
+                                return `<span class="badge bg-danger text-white">Rejected</span>`;
                         }
                     },
 
@@ -599,6 +653,24 @@
 
 
 
+        function renderImage(label, url) {
+            if (!url) {
+                return `
+            <div class="doc-box text-center">
+                <div class="doc-title">${label}</div>
+                <div class="text-muted">Not Uploaded</div>
+            </div>`;
+            }
+
+            return `
+        <div class="doc-box text-center">
+            <div class="doc-title">${label}</div>
+            <img src="${url}"
+                 class="img-thumbnail doc-thumb zoom-img"
+                 data-src="${url}" />
+        </div>`;
+        }
+
 
 
         function populateModal(record) {
@@ -615,6 +687,7 @@
             let streetHtml = "";
 
             record.streets.forEach((s, i) => {
+                const isStatue = s.no_of_statue > 0;
                 streetHtml += `
                 <div class="card-section">
                     <div class="section-title">Street ${i + 1}</div>
@@ -622,40 +695,51 @@
                 <div class="row mb-2">
                     <div class="col-md-4">
                         <div class="label-text">Street Name</div>
-                        <div class="value-text">${s.street_name}</div>
+                        <div class="value-text">${s.street_name || '-'}</div>
                     </div>
                     <div class="col-md-4">
-                        <div class="label-text">Zone</div>
-                        <div class="value-text">${s.zone}</div>
+                        <div class="label-text">Zone / Ward</div>
+                        <div class="value-text">${s.zone} / ${s.ward}</div>
                     </div>
+
+                    ${isStatue ? `
                     <div class="col-md-4">
-                        <div class="label-text">Ward</div>
-                        <div class="value-text">${s.ward}</div>
+                        <div class="label-text">No. of Statue</div>
+                        <div class="value-text">${s.no_of_statue}</div>
                     </div>
                     <div class="col-md-4">
-                        <div class="label-text">No. of Poles</div>
-                        <div class="value-text">${s.no_of_poles}</div>
+                        <div class="label-text">Statue Material</div>
+                        <div class="value-text">
+                            ${s.statue_material || '-'} 
+                            ${(s.statue_material || '').toLowerCase() === 'others'
+                            ? `(${record.others_specify_statue_material || '-'})`
+                            : ''}
+                        </div>
                     </div>
-
-
                     <div class="col-md-4">
-                        <div class="label-text">Height</div>
-                        <div class="value-text">${s.height}</div>
+                        <div class="label-text">Pedestal Material</div>
+                        <div class="value-text">${s.pedestal_material || '-'}</div>
+                    </div>
+                    ` : `
+                    <div class="col-md-4">
+                        <div class="label-text">No. of Poles</div>
+                        <div class="value-text">${s.no_of_poles}</div>
                     </div>
-
                     <div class="col-md-4">
                         <div class="label-text">Flag Material</div>
-                        <div class="value-text">${s.flag_material}</div>
+                        <div class="value-text">${s.flag_material || '-'}</div>
                     </div>
-
                     <div class="col-md-4">
                         <div class="label-text">Pole Material</div>
-                        <div class="value-text">${s.pole_material}</div>
+                        <div class="value-text">${s.pole_material || '-'}</div>
                     </div>
+                    `}
 
+                    <div class="col-md-4">
+                        <div class="label-text">Height</div>
+                        <div class="value-text">${s.height || '-'}</div>
+                    </div>
                 </div>
-
-
             </div>`;
             });
 
@@ -701,14 +785,117 @@
                 historyHtml += `</div>`;
             }
 
+            let documentsHtml = "";
+
+            if (record.is_final_authority_perm === true) {
+                // 🔥 Final Authority Permanent → Hide ALL Documents (including Aadhaar)
+                documentsHtml = "";
+            } else {
+                // 🔥 Normal Flow
+                documentsHtml = `
+                <div class="card-section">
+                    <div class="section-title">Land Related Documents</div>
+                    <div class="d-flex flex-wrap gap-3">
+                        ${renderImage("Land Patta", record.patta_image_url)}
+                        ${renderImage("Affidavit", record.affidavit_image_url)}
+                        ${renderImage("EC", record.ec_image_url)}
+                        ${renderImage("FMB Sketch", record.fmb_sketch_url)}
+                        ${renderImage("Aadhaar", record.aadhaar_image_url)}
+                    </div>
+                </div>`;
+            }
+
+            //             let documentsHtml = `
+            // <div class="card-section">
+            //     <div class="section-title">Land Related Documents</div>
+
+            //     <div class="row g-3">
+
+            //         <div class="col-md-3 col-sm-4 col-6 text-center">
+            //             <div class="doc-title">Land Patta</div>
+            //             <a href="https://picsum.photos/300/400?random=1" target="_blank">
+            //                 <img src="https://picsum.photos/300/400?random=1"
+            //                      class="img-thumbnail doc-thumb">
+            //             </a>
+            //         </div>
+
+            //         <div class="col-md-3 col-sm-4 col-6 text-center">
+            //             <div class="doc-title">Affidavit</div>
+            //             <a href="https://picsum.photos/300/400?random=2" target="_blank">
+            //                 <img src="https://picsum.photos/300/400?random=2"
+            //                      class="img-thumbnail doc-thumb">
+            //             </a>
+            //         </div>
+
+            //         <div class="col-md-3 col-sm-4 col-6 text-center">
+            //             <div class="doc-title">EC</div>
+            //             <a href="https://picsum.photos/300/200?random=3" target="_blank">
+            //                 <img src="https://picsum.photos/300/200?random=3"
+            //                      class="img-thumbnail doc-thumb">
+            //             </a>
+            //         </div>
+
+            //         <div class="col-md-3 col-sm-4 col-6 text-center">
+            //             <div class="doc-title">FMB Sketch</div>
+            //             <a href="https://picsum.photos/300/400?random=4" target="_blank">
+            //                 <img src="https://picsum.photos/300/400?random=4"
+            //                      class="img-thumbnail doc-thumb">
+            //             </a>
+            //         </div>
+
+            //         <div class="col-md-3 col-sm-4 col-6 text-center">
+            //             <div class="doc-title">Aadhaar</div>
+            //             <a href="https://picsum.photos/300/200?random=5" target="_blank">
+            //                 <img src="https://picsum.photos/300/200?random=5"
+            //                      class="img-thumbnail doc-thumb">
+            //             </a>
+            //         </div>
+
+            //     </div>
+            // </div>`;
+
+            //             $("#modalContent").html(`
+            //     ${documentsHtml}
+            // `);
+
+
+            let verificationHtml = "";
+            if (record.verification_questions && record.verification_questions.length > 0) {
+                verificationHtml = `
+                <div class="rdo-box mb-3">
+                    <div class="section-title">Verification Questions</div>
+                    <div id="verificationQuestionsContainer">
+                `;
+
+                record.verification_questions.forEach((q, i) => {
+                    verificationHtml += `
+                    <div class="mb-3 verification-item" data-ques-id="${q.id}">
+                        <label class="form-label">${i + 1}. ${q.question_name}</label>
+                        <select class="form-control verification-answer">
+                            <option value="">Select</option>
+                            ${q.answers.map(a => `<option value="${a.id}">${a.answer_name}</option>`).join('')}
+                        </select>
+                    </div>
+                    `;
+                });
+
+                verificationHtml += `
+                    </div>
+                </div>`;
+            }
+
             let decisionHtml = "";
 
             // 🔹 Show decision buttons ONLY if pending
             if (!record.final_status) {
                 decisionHtml = `
+                 ${documentsHtml}
+
             <div class="rdo-box">
                 <div class="section-title">Department Decision</div>
 
+                ${verificationHtml}
+
                 <textarea id="rdoRemarks" class="form-control mb-3"
                     rows="4" placeholder="Enter remarks..."></textarea>
 
@@ -724,6 +911,8 @@
 
 
 
+            const isPermanent = record.application_type_name === "PERMANENT";
+
             let html = `
         <div class="card-section">
             <div class="section-title">Applicant Information</div>
@@ -740,6 +929,7 @@
             </div>
 
             <div class="row mb-2">
+                ${!isPermanent ? `
                 <div class="col-md-6">
                     <div class="label-text">Event Type</div>
                     <div class="value-text">${record.event_name}</div>
@@ -750,12 +940,40 @@
                         ${new Date(record.event_date).toLocaleDateString("en-GB")}
                     </div>
                 </div>
+                ` : ""}
+
+                <div class="col-md-6">
+                    <div class="label-text">Application Type</div>
+                    <div class="value-text">${record.application_type_name}</div>
+                </div>
+
+                ${isPermanent ? `
+                <div class="col-md-6">
+                    <div class="label-text">Installation Type</div>
+                    <div class="value-text">${record.installation_name || '-'}</div>
+                </div>
+
+                <div class="col-md-6">
+                    <div class="label-text">Option</div>
+                    <div class="value-text">${record.option_name || '-'}</div>
+                </div>
+
+                <div class="col-md-6">
+                    <div class="label-text">Place of Erection</div>
+                    <div class="value-text">
+                        ${record.place_of_erection || '-'}
+                    </div>
+                </div>
+                ` : ""}
+
                 <div class="col-md-6">
                     <div class="label-text">Address</div>
                     <div class="value-text">
                         ${record.applicant_address}
                     </div>
                 </div>
+                
+                ${!isPermanent ? `
                 <div class="col-md-6">
                     <div class="label-text">Total Cost</div>
                     <div class="value-text">
@@ -770,6 +988,7 @@
                         <div class="label-text">Event Description</div>
                         <div class="value-text">${record.event_desc}</div>
                 </div>
+                ` : ""}
 
             </div>
 
@@ -860,6 +1079,7 @@
         //     });
         // }
 
+
         function submitOfficerDecision(status) {
 
             let remarks = ($("#rdoRemarks").val() || "").trim();
@@ -868,6 +1088,32 @@
             let gccUserId = $("#loginuserid").val();   // login user id
             let username = $("#userName").val();      // display username
 
+            // 🔥 Collect verification answers
+            let answers = [];
+
+            $(".verification-item").each(function () {
+
+                const quesId = $(this).data("ques-id");
+                const ansId = $(this).find(".verification-answer").val();
+
+                if (!ansId) {
+                    Swal.fire({
+                        icon: 'warning',
+                        title: 'Validation',
+                        text: 'Please answer all verification questions'
+                    });
+                    answers = null;
+                    return false; // break loop
+                }
+
+                answers.push({
+                    quesId: quesId,
+                    ansId: ansId
+                });
+            });
+
+            if (answers === null) return;
+
             if (!remarks) {
                 Swal.fire({
                     icon: 'warning',
@@ -897,7 +1143,8 @@
                         status: status,
                         remarks: remarks,
                         gccUserId: gccUserId,
-                        username: username          // ✅ NEW
+                        username: username,
+                        answers: JSON.stringify(answers)   // 🔥 IMPORTANT
                     },
                     success: function (res) {
 
@@ -924,6 +1171,70 @@
         }
 
 
+        // function submitOfficerDecision(status) {
+
+        //     let remarks = ($("#rdoRemarks").val() || "").trim();
+        //     let refid = $("#detailsModal").data("refid");
+
+        //     let gccUserId = $("#loginuserid").val();   // login user id
+        //     let username = $("#userName").val();      // display username
+
+        //     if (!remarks) {
+        //         Swal.fire({
+        //             icon: 'warning',
+        //             title: 'Remarks Required',
+        //             text: 'Please enter remarks before submitting'
+        //         });
+        //         return;
+        //     }
+
+        //     Swal.fire({
+        //         title: `Are you sure?`,
+        //         text: `You want to ${status.toLowerCase()} this request`,
+        //         icon: status === 'APPROVED' ? 'success' : 'error',
+        //         showCancelButton: true,
+        //         confirmButtonColor: status === 'APPROVED' ? '#28a745' : '#dc3545',
+        //         cancelButtonColor: '#6c757d',
+        //         confirmButtonText: `Yes, ${status}`
+        //     }).then((result) => {
+
+        //         if (!result.isConfirmed) return;
+
+        //         $.ajax({
+        //             url: "/flagpoles/api/flagpoleregistration/officer/updateDecision",
+        //             type: "POST",
+        //             data: {
+        //                 refid: refid,
+        //                 status: status,
+        //                 remarks: remarks,
+        //                 gccUserId: gccUserId,
+        //                 username: username          // ✅ NEW
+        //             },
+        //             success: function (res) {
+
+        //                 Swal.fire({
+        //                     icon: 'success',
+        //                     title: status === 'APPROVED' ? 'Approved!' : 'Rejected!',
+        //                     text: res.message || `Request has been ${status.toLowerCase()}`,
+        //                     timer: 2000,
+        //                     showConfirmButton: false
+        //                 });
+
+        //                 $("#detailsModal").modal("hide");
+        //                 $("#QaqcDatatable").DataTable().ajax.reload(null, false);
+        //             },
+        //             error: function () {
+        //                 Swal.fire({
+        //                     icon: 'error',
+        //                     title: 'Error',
+        //                     text: 'Failed to update decision'
+        //                 });
+        //             }
+        //         });
+        //     });
+        // }
+
+
     </script>
 </body>