组织画像-勤务模块

airport-admin/src/main/java/com/sundot/airport/web/controller/portrait/AttendanceStatsController.java

@@ -95,17 +95,21 @@ public class AttendanceStatsController {
         List<Map<String, Object>> trendData = new ArrayList<>();
         try {
             // 获取班次开始和结束时间
-            String startTime = configService.selectConfigByKey("attendance.post.record.start.time");
-            String endTime = configService.selectConfigByKey("attendance.post.record.end.time");
+//            String startTime = configService.selectConfigByKey("attendance.post.record.start.time");
+//            String endTime = configService.selectConfigByKey("attendance.post.record.end.time");
+//            Date shiftStartTime = DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startDate) + " " + startTime);
+//            Date shiftEndTime = DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(endDate, 1)) + " " + endTime);
+            String startTime = "00:00:00";
+            String endTime = "23:59:59";
             Date shiftStartTime = DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startDate) + " " + startTime);
-            Date shiftEndTime = DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(endDate, 1)) + " " + endTime);
+            Date shiftEndTime = DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endDate) + " " + endTime);
 
             // 一次性查询整个时间范围内的所有在岗记录
             AttendancePostRecord queryPostRecord = new AttendancePostRecord();
             queryPostRecord.setCheckInTimeStart(shiftStartTime);
             queryPostRecord.setCheckInTimeEnd(shiftEndTime);
             if (Objects.nonNull(params.getDeptId())) {
-                queryPostRecord.setAttendanceDepartmentId(params.getDeptId());
+                queryPostRecord.setAttendanceBrigadeId(params.getDeptId());
             }
             List<AttendancePostRecord> postRecords = attendancePostRecordService.selectAttendancePostRecordList(queryPostRecord);
 

airport-attendance/src/main/java/com/sundot/airport/attendance/portrait/StationWorkStatsService.java

@@ -56,7 +56,7 @@ public class StationWorkStatsService {
         // 直接查询部门信息
         SysDept queryDept = new SysDept();
         queryDept.setDeptId(stationId);
-        queryDept.setDeptType(DeptTypeEnum.DEPARTMENT.getCode());
+        queryDept.setDeptType(DeptTypeEnum.BRIGADE.getCode());
         List<SysDept> sysDeptList = sysDeptService.selectDeptInfo(queryDept);
 
         if (CollectionUtil.isEmpty(sysDeptList)) {
@@ -99,7 +99,7 @@ public class StationWorkStatsService {
         stationStats.setDeptId(dept.getDeptId());
         stationStats.setDeptName(dept.getDeptName());
 
-        indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), dept.getDeptType()) ? UserType.STATION : UserType.DEPARTMENT);
+        indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), dept.getDeptType()) ? UserType.STATION : UserType.BRIGADE);
 
 
         //获取指标

airport-attendance/src/main/java/com/sundot/airport/attendance/portrait/WorkingDateIndicator.java

@@ -66,6 +66,9 @@ public class WorkingDateIndicator implements Indicator<Object> {
                 case DEPARTMENT:
                     record.setDepartmentCode(deptId.toString());
                     break;
+                case BRIGADE:
+                    record.setBrigadeCode(deptId.toString());
+                    break;
                 case STATION:
                     record.setStationCode(deptId.toString());
                     break;

airport-attendance/src/main/java/com/sundot/airport/attendance/portrait/WorkingHoursIndicator.java

@@ -73,6 +73,9 @@ public class WorkingHoursIndicator implements Indicator<Object> {
                 case DEPARTMENT:
                     record.setAttendanceDepartmentId(deptId);
                     break;
+                case BRIGADE:
+                    record.setAttendanceBrigadeId(deptId);
+                    break;
                 case STATION:
                     record.setAttendanceStationId(deptId);
                     break;