changed quey for progress details of Roadwar works dashboard

src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java

@@ -17,11 +17,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 public class DataSourceConfig {
 
-	 private static String host = "localhost:3306";
-	 private static String dbpassword = "root";
+//	 private static String host = "localhost:3306";
+//	 private static String dbpassword = "root";
 
-//	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";
 
 	public static class MyDataSourceConfig {
 		@Primary

src/main/java/com/gcc/commissionerreview/service/WorksService.java

@@ -1296,32 +1296,32 @@ public class WorksService {
             int estid,
             int ref_id) {
 
-        String sql = " SELECT "
-        		+ "                td.tdid, "
-        		+ "                td.estid, "
-        		+ "                td.ref_id, "
-        		+ "                td.percentage, "
-        		+ "                td.stage_file, "
-        		+ "                CONCAT('" + fileBaseUrl + "/gccofficialapp/files',  td.stage_file) AS view_stage_file, "
-        		+ "				   DATE_FORMAT(td.cdate, '%d-%m-%Y %H:%i:%s') as cdate,"
-        		+ "                td.cdate, "
-        		+ "                td.remarks, "
-        		+ "                td.tmid, "
-        		+ "                tm.taskname, "
-        		+ "                tm.orderby "
-        		+ "            FROM erp_task_data td "
-        		+ "            INNER JOIN typeofwork_task_master tm "
-        		+ "                ON tm.tmid = td.tmid "
-        		+ "                AND tm.isactive = 1 "
-        		+ "                AND tm.isdelete = 0 "
-        		+ " "
-        		+ "            WHERE td.estid = ? "
-        		+ "              AND td.ref_id = ? "
-        		+ "              AND td.isactive = 1 "
-        		+ "            ORDER BY "
-        		+ "                tm.orderby DESC, "
-        		+ "                td.cdate DESC, "
-        		+ "                td.tdid DESC ";
+    	String sql = " SELECT "
+                + "                td.tdid, "
+                + "                td.estid, "
+                + "                td.ref_id, "
+                + "                td.percentage, "
+                + "                td.stage_file, "
+                + "                CONCAT('" + fileBaseUrl+ "/gccofficialapp/files',  td.stage_file) AS view_stage_file, "
+                + "				   DATE_FORMAT(td.cdate, '%d-%m-%Y %H:%i:%s') as cdate,"
+                + "                td.cdate, "
+                + "                td.remarks, "
+                + "                td.tmid, "
+                + "                tm.stagename as taskname, "
+                + "                tm.orderby "
+                + "            FROM erp_task_data td "
+                + "            INNER JOIN erp_works_stages tm "
+                + "                ON tm.tmid = td.tmid "
+                + "                AND tm.isactive = 1 "
+                + "                AND tm.isdelete = 0 "
+                + " "
+                + "            WHERE td.estid = ? "
+                + "              AND td.ref_id = ? "
+                + "              AND td.isactive = 1 "
+                + "            ORDER BY "
+                + "                tm.orderby DESC, "
+                + "                td.cdate DESC, "
+                + "                td.tdid DESC ";
 
         return jdbcWorksTemplate.queryForList(
             sql,

src/main/resources/application.properties

@@ -1,2 +1,2 @@
-#spring.profiles.active=prod
-spring.profiles.active=dev
+spring.profiles.active=prod
+#spring.profiles.active=dev