From 791196e2cd784f6bdf6dfdac9f74cfb2950194c8 Mon Sep 17 00:00:00 2001
From: Hariprasath S <113695067+Hariprasath4022@users.noreply.github.com>
Date: Wed, 7 Oct 2026 13:55:36 +0530
Subject: [PATCH] Changed query for within six_month in roadwar register

---
 .../service/RoadWarService.java               | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java b/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java
index 87726f9..959b2d9 100644
--- a/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java
+++ b/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java
@@ -1706,7 +1706,7 @@ public class RoadWarService {
 				                            ym.year_name,
 				                            '-',
 				                            LPAD(rd.relay_month, 2, '0'),
-				                            '-01'
+				                            '-28'
 				                        ),
 				                        '%Y-%m-%d'
 				                    ) >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
@@ -1722,7 +1722,7 @@ public class RoadWarService {
 				                            ym.year_name,
 				                            '-',
 				                            LPAD(rd.relay_month, 2, '0'),
-				                            '-01'
+				                            '-28'
 				                        ),
 				                        '%Y-%m-%d'
 				                    ) >= DATE_SUB(CURDATE(), INTERVAL 1 YEAR)
@@ -1732,7 +1732,7 @@ public class RoadWarService {
 				                            ym.year_name,
 				                            '-',
 				                            LPAD(rd.relay_month, 2, '0'),
-				                            '-01'
+				                            '-28'
 				                        ),
 				                        '%Y-%m-%d'
 				                    ) < DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
@@ -1749,7 +1749,7 @@ public class RoadWarService {
 				                            ym.year_name,
 				                            '-',
 				                            LPAD(rd.relay_month, 2, '0'),
-				                            '-01'
+				                            '-28'
 				                        ),
 				                        '%Y-%m-%d'
 				                    ) < DATE_SUB(CURDATE(), INTERVAL 1 YEAR)
@@ -1761,15 +1761,15 @@ public class RoadWarService {
 
 				        FROM road_details_master r
 
-				        INNER JOIN relaying_details rd
-				            ON r.ref_id = rd.road_ref_id
+				        LEFT JOIN relaying_details rd
+				            ON r.ref_id = rd.road_ref_id AND rd.is_active = 1 AND rd.is_delete = 0
 
-				        INNER JOIN month_master mm
+				        LEFT JOIN month_master mm
 				            ON mm.id = rd.relay_month
 				           AND mm.is_active = 1
 				           AND mm.is_delete = 0
 
-				        INNER JOIN year_master ym
+				        LEFT JOIN year_master ym
 				            ON ym.id = rd.relay_year
 				           AND ym.is_active = 1
 				           AND ym.is_delete = 0
@@ -1777,8 +1777,6 @@ public class RoadWarService {
 				        WHERE r.is_active = 1
 				          AND r.is_delete = 0
 
-				          AND rd.is_active = 1
-				          AND rd.is_delete = 0
 				        """;
 				
 				List<Object> relayingParams = new ArrayList<>();
@@ -2057,18 +2055,18 @@ public class RoadWarService {
 
 						FROM road_details_master r
 
-						INNER JOIN relaying_details rd
-						    ON r.ref_id = rd.road_ref_id
+						LEFT JOIN relaying_details rd
+						    ON r.ref_id = rd.road_ref_id  AND rd.is_active = 1  AND rd.is_delete = 0
 
 						LEFT JOIN road_type_master rt
 						    ON rt.id = r.road_type
 
-						INNER JOIN month_master mm
+						LEFT JOIN month_master mm
 						    ON mm.id = rd.relay_month
 						   AND mm.is_active = 1
 						   AND mm.is_delete = 0
 
-						INNER JOIN year_master ym
+						LEFT JOIN year_master ym
 						    ON ym.id = rd.relay_year
 						   AND ym.is_active = 1
 						   AND ym.is_delete = 0
@@ -2076,8 +2074,6 @@ public class RoadWarService {
 						WHERE r.is_active = 1
 						  AND r.is_delete = 0
 
-						  AND rd.is_active = 1
-						  AND rd.is_delete = 0
 						""");
 
 				List<Object> params = new ArrayList<>();
@@ -2126,7 +2122,7 @@ public class RoadWarService {
 						        ym.year_name,
 						        '-',
 						        LPAD(rd.relay_month, 2, '0'),
-						        '-01'
+						        '-28'
 						    ),
 						    '%Y-%m-%d'
 						)