From 561dc7abf96a5dd3281d9dcc8efa8071500082a6 Mon Sep 17 00:00:00 2001 From: AJITHKUMAR12 <48044092+AJITHKUMAR12@users.noreply.github.com> Date: Fri, 5 Jun 2026 09:52:56 +0530 Subject: [PATCH] fixed the order question for bulk download --- .../childrensurvey/Service/ChildrenSurveyService.java | 7 ++++--- .../templates/modules/childrensurvey/childlist.html | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/childrensurvey/Service/ChildrenSurveyService.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/childrensurvey/Service/ChildrenSurveyService.java index 75fcd80e..110082b5 100644 --- a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/childrensurvey/Service/ChildrenSurveyService.java +++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/childrensurvey/Service/ChildrenSurveyService.java @@ -172,8 +172,8 @@ public class ChildrenSurveyService { params.add(toDate); } - // sql.append(" GROUP BY csr.survey_id ORDER BY MAX(csr.cdate) DESC"); - sql.append(" GROUP BY csr.survey_id ORDER BY csr.survey_id "); + sql.append(" GROUP BY csr.survey_id ORDER BY MAX(csr.cdate) DESC"); + // sql.append(" GROUP BY csr.survey_id ORDER BY csr.survey_id "); return jdbcTemplate.queryForList(sql.toString(), params.toArray()); } @@ -3362,9 +3362,10 @@ public class ChildrenSurveyService { GROUP BY pr.survey_id - ORDER BY pr.survey_id + ORDER BY pr.cdate desc """); + // ORDER BY pr.survey_id return jdbcTemplate.queryForList( sql.toString(), diff --git a/gcc_officer_portal/src/main/resources/templates/modules/childrensurvey/childlist.html b/gcc_officer_portal/src/main/resources/templates/modules/childrensurvey/childlist.html index 499fa81a..94122e60 100644 --- a/gcc_officer_portal/src/main/resources/templates/modules/childrensurvey/childlist.html +++ b/gcc_officer_portal/src/main/resources/templates/modules/childrensurvey/childlist.html @@ -695,12 +695,12 @@ "Aadhar card", "Aadhar No", - "Community Certificate", - "Birth Certificate", "Any corrections to be made in Aadhar card document?", "If Not Why Aadhar card?", + "Community Certificate", "Any corrections to be made in community certificate document?", "If Not Why community certificate?", + "Birth Certificate", "Any corrections to be made in birth certificate document?", "If Not Why birth certificate?",