hariprasaths
/
commissioner_review_1_may2025
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Changed query for within six_month in roadwar register

master
Hariprasath S 6 days ago
parent
74ef270367
commit
791196e2cd
1 changed files with 13 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/main/java/com/gcc/commissionerreview/service/RoadWarService.java

30
src/main/java/com/gcc/commissionerreview/service/RoadWarService.java
View File

@ -1706,7 +1706,7 @@ public class RoadWarService {
ym.year_name, ym.year_name,
'-', '-',
LPAD(rd.relay_month, 2, '0'), LPAD(rd.relay_month, 2, '0'),
'-01'
'-28'
), ),
'%Y-%m-%d' '%Y-%m-%d'
) >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH) ) >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
@ -1722,7 +1722,7 @@ public class RoadWarService {
ym.year_name, ym.year_name,
'-', '-',
LPAD(rd.relay_month, 2, '0'), LPAD(rd.relay_month, 2, '0'),
'-01'
'-28'
), ),
'%Y-%m-%d' '%Y-%m-%d'
) >= DATE_SUB(CURDATE(), INTERVAL 1 YEAR) ) >= DATE_SUB(CURDATE(), INTERVAL 1 YEAR)
@ -1732,7 +1732,7 @@ public class RoadWarService {
ym.year_name, ym.year_name,
'-', '-',
LPAD(rd.relay_month, 2, '0'), LPAD(rd.relay_month, 2, '0'),
'-01'
'-28'
), ),
'%Y-%m-%d' '%Y-%m-%d'
) < DATE_SUB(CURDATE(), INTERVAL 6 MONTH) ) < DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
@ -1749,7 +1749,7 @@ public class RoadWarService {
ym.year_name, ym.year_name,
'-', '-',
LPAD(rd.relay_month, 2, '0'), LPAD(rd.relay_month, 2, '0'),
'-01'
'-28'
), ),
'%Y-%m-%d' '%Y-%m-%d'
) < DATE_SUB(CURDATE(), INTERVAL 1 YEAR) ) < DATE_SUB(CURDATE(), INTERVAL 1 YEAR)
@ -1761,15 +1761,15 @@ public class RoadWarService {
FROM road_details_master r 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 ON mm.id = rd.relay_month
AND mm.is_active = 1 AND mm.is_active = 1
AND mm.is_delete = 0 AND mm.is_delete = 0
INNER JOIN year_master ym
LEFT JOIN year_master ym
ON ym.id = rd.relay_year ON ym.id = rd.relay_year
AND ym.is_active = 1 AND ym.is_active = 1
AND ym.is_delete = 0 AND ym.is_delete = 0
@ -1777,8 +1777,6 @@ public class RoadWarService {
WHERE r.is_active = 1 WHERE r.is_active = 1
AND r.is_delete = 0 AND r.is_delete = 0
AND rd.is_active = 1
AND rd.is_delete = 0
"""; """;
List<Object> relayingParams = new ArrayList<>(); List<Object> relayingParams = new ArrayList<>();
@ -2057,18 +2055,18 @@ public class RoadWarService {
FROM road_details_master r 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 LEFT JOIN road_type_master rt
ON rt.id = r.road_type ON rt.id = r.road_type
INNER JOIN month_master mm
LEFT JOIN month_master mm
ON mm.id = rd.relay_month ON mm.id = rd.relay_month
AND mm.is_active = 1 AND mm.is_active = 1
AND mm.is_delete = 0 AND mm.is_delete = 0
INNER JOIN year_master ym
LEFT JOIN year_master ym
ON ym.id = rd.relay_year ON ym.id = rd.relay_year
AND ym.is_active = 1 AND ym.is_active = 1
AND ym.is_delete = 0 AND ym.is_delete = 0
@ -2076,8 +2074,6 @@ public class RoadWarService {
WHERE r.is_active = 1 WHERE r.is_active = 1
AND r.is_delete = 0 AND r.is_delete = 0
AND rd.is_active = 1
AND rd.is_delete = 0
"""); """);
List<Object> params = new ArrayList<>(); List<Object> params = new ArrayList<>();
@ -2126,7 +2122,7 @@ public class RoadWarService {
ym.year_name, ym.year_name,
'-', '-',
LPAD(rd.relay_month, 2, '0'), LPAD(rd.relay_month, 2, '0'),
'-01'
'-28'
), ),
'%Y-%m-%d' '%Y-%m-%d'
) )

Write Preview
Loading…
Cancel
Save