1개의 변경된 파일과 2개의 추가작업 그리고 0개의 파일을 삭제
통합 보기
Diff Options
+ 2
- 0
src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
파일 보기
| @@ -1324,6 +1324,7 @@ open class DashboardService( | |||||
| + " LEFT JOIN timesheet ts" | + " LEFT JOIN timesheet ts" | ||||
| + " ON DATE_FORMAT(ts.recordDate, '%Y-%m') = DATE_FORMAT(ds.month, '%Y-%m') and ts.staffID = st.id" | + " ON DATE_FORMAT(ts.recordDate, '%Y-%m') = DATE_FORMAT(ds.month, '%Y-%m') and ts.staffID = st.id" | ||||
| + " WHERE ds.month BETWEEN DATE_FORMAT(:startdate, '%Y-%m-01') AND DATE_FORMAT(:enddate, '%Y-%m-01')" | + " WHERE ds.month BETWEEN DATE_FORMAT(:startdate, '%Y-%m-01') AND DATE_FORMAT(:enddate, '%Y-%m-01')" | ||||
| + " and ts.recordDate BETWEEN DATE_FORMAT(:startdate, '%Y-%m-%d') AND DATE_FORMAT(DATE_ADD(:startdate, INTERVAL 6 DAY), '%Y-%m-%d')" | |||||
| + " GROUP BY ds.month, st.teamId" | + " GROUP BY ds.month, st.teamId" | ||||
| + " ORDER BY ds.month" | + " ORDER BY ds.month" | ||||
| ) | ) | ||||
| @@ -1381,6 +1382,7 @@ open class DashboardService( | |||||
| + " LEFT JOIN timesheet ts" | + " LEFT JOIN timesheet ts" | ||||
| + " ON DATE_FORMAT(ts.recordDate, '%m-%d') = DATE_FORMAT(ds.day, '%m-%d') and ts.staffID = st.id" | + " ON DATE_FORMAT(ts.recordDate, '%m-%d') = DATE_FORMAT(ds.day, '%m-%d') and ts.staffID = st.id" | ||||
| + " WHERE ds.day BETWEEN DATE_FORMAT(:startdate, '%Y-%m-%d') AND DATE_FORMAT(DATE_ADD(:startdate, INTERVAL 6 DAY), '%Y-%m-%d')" | + " WHERE ds.day BETWEEN DATE_FORMAT(:startdate, '%Y-%m-%d') AND DATE_FORMAT(DATE_ADD(:startdate, INTERVAL 6 DAY), '%Y-%m-%d')" | ||||
| + " and ts.recordDate BETWEEN DATE_FORMAT(:startdate, '%Y-%m-%d') AND DATE_FORMAT(DATE_ADD(:startdate, INTERVAL 6 DAY), '%Y-%m-%d')" | |||||
| + " GROUP BY ds.day, st.teamId" | + " GROUP BY ds.day, st.teamId" | ||||
| + " ORDER BY ds.day" | + " ORDER BY ds.day" | ||||
| ) | ) | ||||