|
|
@ -1302,15 +1302,15 @@ public class WorksService { |
|
|
+ " td.ref_id, " |
|
|
+ " td.ref_id, " |
|
|
+ " td.percentage, " |
|
|
+ " td.percentage, " |
|
|
+ " td.stage_file, " |
|
|
+ " 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," |
|
|
+ " DATE_FORMAT(td.cdate, '%d-%m-%Y %H:%i:%s') as cdate," |
|
|
+ " td.cdate, " |
|
|
+ " td.cdate, " |
|
|
+ " td.remarks, " |
|
|
+ " td.remarks, " |
|
|
+ " td.tmid, " |
|
|
+ " td.tmid, " |
|
|
+ " tm.taskname, " |
|
|
|
|
|
|
|
|
+ " tm.stagename as taskname, " |
|
|
+ " tm.orderby " |
|
|
+ " tm.orderby " |
|
|
+ " FROM erp_task_data td " |
|
|
+ " FROM erp_task_data td " |
|
|
+ " INNER JOIN typeofwork_task_master tm " |
|
|
|
|
|
|
|
|
+ " INNER JOIN erp_works_stages tm " |
|
|
+ " ON tm.tmid = td.tmid " |
|
|
+ " ON tm.tmid = td.tmid " |
|
|
+ " AND tm.isactive = 1 " |
|
|
+ " AND tm.isactive = 1 " |
|
|
+ " AND tm.isdelete = 0 " |
|
|
+ " AND tm.isdelete = 0 " |
|
|
|