Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/attendance/controller/StatisticsController.java

@@ -151,15 +151,23 @@ public class StatisticsController {
                     }
                 }
             }
-
-            teacherPageDto.setDeptIds(deptIds);
+            if(dto.getDeptId() == null){
+                teacherPageDto.setDeptIds(deptIds);
+            }else{
+                deptIds = new ArrayList<>();
+                deptIds.add(dto.getDeptId());
+            }
             List<XjrUserPageVo> attendanceTeacherList = teacherbaseManagerService.getList(teacherPageDto);
 
             teacherPageDto = new BaseTeacherPageDto();
             teacherPageDto.setUserIds(userIds);
             attendanceTeacherList.addAll(teacherbaseManagerService.getList(teacherPageDto));
 
-            List<XjrUserPageVo> allTeacherList = teacherbaseManagerService.getList(new BaseTeacherPageDto());
+            teacherPageDto = new BaseTeacherPageDto();
+            List<Long> dtoDeptIds = new ArrayList<>();
+            dtoDeptIds.add(dto.getDeptId());
+            teacherPageDto.setDeptIds(dtoDeptIds);
+            List<XjrUserPageVo> allTeacherList = teacherbaseManagerService.getList(teacherPageDto);
 
             statisticsVo.setNotAttendanceCount(allTeacherList.size() - attendanceTeacherList.size());
         }

src/main/java/com/xjrsoft/module/attendance/service/impl/AttendanceStatisticsServiceImpl.java

@@ -206,10 +206,15 @@ public class AttendanceStatisticsServiceImpl extends MPJBaseServiceImpl<Attendan
 
                 Map<Long, AttendanceRuleDetailsUserVo> teacherRules = ruleCategoryService.getAllTeacherTodyRule(now.getDayOfWeek().name());
 
-                //教师
-                outInRecordUtil.getTeacherRecords(faceImportMapper, startDateTime, endDateTime, teacherRules);
-                //拉取车辆数据
-                outInRecordUtil.GetVehicleRecord(faceImportMapper, startDateTime, endDateTime);
+                try {
+                    //教师
+                    outInRecordUtil.getTeacherRecords(faceImportMapper, startDateTime, endDateTime, teacherRules);
+                    //拉取车辆数据
+                    outInRecordUtil.GetVehicleRecord(faceImportMapper, startDateTime, endDateTime);
+                }catch (Exception e){
+                    Log.error(e.getMessage());
+                }
+
 
                 AttendanceRecordTask recordTask = new AttendanceRecordTask();
                 recordTask.teacherAttendanceRecord(startDateTime, statistics.getTimePeriod(),

src/main/java/com/xjrsoft/module/base/controller/BaseClassController.java

@@ -79,11 +79,12 @@ public class BaseClassController {
                         setEnabledMark(EnabledMark.ENABLED.getCode());
                     }}
             );
+            baseClass.setDeleteMark(DeleteMark.DELETED.getCode());
         }
         if(!classTeacherChangeList.isEmpty()){
             classTeacherChangeService.saveBatch(classTeacherChangeList);
         }
-        return RT.ok(baseClassService.removeByIds(ids));
+        return RT.ok(baseClassService.updateBatchById(classList));
     }
 
     @GetMapping(value = "/info")