diff --git a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java index bde8ba4..3a9feb8 100644 --- a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java +++ b/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 diff --git a/src/main/java/com/gcc/commissionerreview/service/WorksService.java b/src/main/java/com/gcc/commissionerreview/service/WorksService.java index e9b4c9b..03ff862 100644 --- a/src/main/java/com/gcc/commissionerreview/service/WorksService.java +++ b/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, diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7470be5..196b48f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,2 +1,2 @@ -#spring.profiles.active=prod -spring.profiles.active=dev \ No newline at end of file +spring.profiles.active=prod +#spring.profiles.active=dev \ No newline at end of file