Browse Source

changed quey for progress details of Roadwar works dashboard

master
Hariprasath S 1 week ago
parent
commit
baf568172f
  1. 8
      src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
  2. 6
      src/main/java/com/gcc/commissionerreview/service/WorksService.java
  3. 4
      src/main/resources/application.properties

8
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

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

@ -1302,15 +1302,15 @@ public class WorksService {
+ " td.ref_id, "
+ " td.percentage, "
+ " td.stage_file, "
+ " CONCAT('" + fileBaseUrl + "/gccofficialapp/files', td.stage_file) AS view_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.stagename as taskname, "
+ " tm.orderby "
+ " FROM erp_task_data td "
+ " INNER JOIN typeofwork_task_master tm "
+ " INNER JOIN erp_works_stages tm "
+ " ON tm.tmid = td.tmid "
+ " AND tm.isactive = 1 "
+ " AND tm.isdelete = 0 "

4
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
Loading…
Cancel
Save