fixed the order question for bulk download

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(),

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?",