教师考勤查询

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

@@ -1,39 +1,13 @@
 package com.xjrsoft.module.attendance.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.xjrsoft.common.enums.OutInStatusEnum;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.attendance.dto.TeacherDetailsDto;
-import com.xjrsoft.module.attendance.entity.AttendanceUserRelation;
-import com.xjrsoft.module.attendance.service.IAttendanceRuleCategoryService;
-import com.xjrsoft.module.attendance.vo.AttendanceRuleDetailsUserVo;
+import com.xjrsoft.module.attendance.service.ITeacherAttendanceRecordService;
 import com.xjrsoft.module.attendance.vo.TeacherStatisticsPageVo;
-import com.xjrsoft.module.holiday.entity.HolidayDate;
-import com.xjrsoft.module.holiday.service.IHolidayDateService;
-import com.xjrsoft.module.organization.entity.Department;
-import com.xjrsoft.module.organization.entity.User;
-import com.xjrsoft.module.organization.entity.UserDeptRelation;
-import com.xjrsoft.module.organization.service.IUserService;
-import com.xjrsoft.module.outint.dto.TeacherOutInRecordDto;
-import com.xjrsoft.module.outint.entity.CarOutInRecord;
-import com.xjrsoft.module.outint.entity.TeacherOutInRecord;
-import com.xjrsoft.module.outint.service.ICarOutInRecordService;
-import com.xjrsoft.module.outint.service.ITeacherOutInRecordService;
-import com.xjrsoft.module.personnel.entity.CarMessageApply;
-import com.xjrsoft.module.teacher.entity.BaseTeacher;
-import com.xjrsoft.module.teacher.entity.WfHeadTeacherLeave;
-import com.xjrsoft.module.teacher.entity.WfTeacherleave;
-import com.xjrsoft.module.teacher.entity.XjrUser;
-import com.xjrsoft.module.teacher.service.IWfHeadTeacherLeaveService;
-import com.xjrsoft.module.teacher.service.IWfTeacherleaveService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -42,12 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
 * @title: 教师考勤
@@ -61,169 +29,13 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class TeacherStatisticsController {
 
-
-    private final IUserService xjrUserService;
-    private final ITeacherOutInRecordService teacherOutInRecordService;
-    private final IWfTeacherleaveService wfTeacherleaveService;
-    private final IHolidayDateService holidayDateService;
-    private final IWfHeadTeacherLeaveService headTeacherLeaveService;
-    private final IAttendanceRuleCategoryService attendanceRuleCategoryService;
-    private final ICarOutInRecordService carOutInRecordService;
+    private final ITeacherAttendanceRecordService attendanceRecordService;
 
     @GetMapping(value = "/teacher-details")
     @ApiOperation(value="教师考勤")
     @SaCheckPermission("statistics:detail")
     public RT<PageOutput<TeacherStatisticsPageVo>> teacherDetails(@Valid TeacherDetailsDto dto){
-        MPJLambdaWrapper<User> queryUser = new MPJLambdaWrapper<>();
-        queryUser.disableSubLogicDel().distinct()
-                .eq(ObjectUtil.isNotNull(dto.getDeptId()), UserDeptRelation::getDeptId, dto.getDeptId())
-                .eq(StrUtil.isNotEmpty(dto.getAttendanceMode()), AttendanceUserRelation::getAttendanceMode, dto.getAttendanceMode())
-                .like(StrUtil.isNotEmpty(dto.getCarNumber()), AttendanceUserRelation::getCarNumber, dto.getCarNumber())
-                .like(StrUtil.isNotEmpty(dto.getName()), User::getName, dto.getName())
-                .selectAs(User::getName, TeacherStatisticsPageVo::getTeacherName)
-                .selectAs(User::getId, TeacherStatisticsPageVo::getUserId)
-                .selectAs(User::getMobile, TeacherStatisticsPageVo::getMobile)
-                .selectAs(Department::getName, TeacherStatisticsPageVo::getDeptName)
-                .innerJoin(BaseTeacher.class, BaseTeacher::getUserId, User::getId)
-                .innerJoin(UserDeptRelation.class, UserDeptRelation::getUserId, User::getId)
-                .leftJoin(AttendanceUserRelation.class, AttendanceUserRelation::getUserId, User::getId)
-                .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId);
-        IPage<TeacherStatisticsPageVo> voIPage = xjrUserService.selectJoinListPage(ConventPage.getPage(dto), TeacherStatisticsPageVo.class, queryUser);
-
-        if(dto.getDate() != null && !"".equals(dto.getDate())){
-            DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE;
-            LocalDate queryDate = LocalDate.parse(dto.getDate(), formatter);
-
-            HolidayDate holidayDate = holidayDateService.getOne(
-                    new QueryWrapper<HolidayDate>().lambda()
-                            .eq(HolidayDate::getDate, queryDate)
-            );
-            if(holidayDate != null && holidayDate.getWay() != null && holidayDate.getWay() != 0){
-                return RT.ok(ConventPage.getPageOutput(voIPage, TeacherStatisticsPageVo.class));
-            }
-
-            List<Long> userIds = voIPage.getRecords().stream().map(TeacherStatisticsPageVo::getUserId).collect(Collectors.toList());
-            Map<Long, AttendanceRuleDetailsUserVo> teacherTodyRuleByUserId = attendanceRuleCategoryService.getTeacherTodyRuleByUserId(userIds);
-            
-//            //查询当前时间段存在请假的教师
-//            Map<Long, WfTeacherleave> leaveList = wfTeacherleaveService.getLeaveList(startTime, endTime);
-//
-//            Map<Long, WfHeadTeacherLeave> teacherLeaveMap = headTeacherLeaveService.getLeaveList(startTime, endTime);
-//            //查询进入记录
-//            List<TeacherOutInRecord> outInRecords = teacherOutInRecordService.list(
-//                    new QueryWrapper<TeacherOutInRecord>().lambda()
-//                            .between(TeacherOutInRecord::getRecordTime, startTime, endTime)
-//                            .eq(TeacherOutInRecord::getStatus, 1)
-//                            .orderByAsc(TeacherOutInRecord::getRecordTime)
-//            );
-//            Map<Long, TeacherOutInRecord> outInMap = new HashMap<>();
-//            for (TeacherOutInRecord inRecord : outInRecords) {
-//                if(outInMap.containsKey(inRecord.getUserId())){
-//                    continue;
-//                }
-//                outInMap.put(inRecord.getUserId(), inRecord);
-//            }
-            for (TeacherStatisticsPageVo record : voIPage.getRecords()) {
-                LocalDateTime startTime, endTime, amEndTime = null;
-                AttendanceRuleDetailsUserVo detailsUserVo = teacherTodyRuleByUserId.get(record.getUserId());
-                if(dto.getTimePeriod() != null && dto.getTimePeriod() == 1){
-                    startTime = queryDate.atTime(5, 0, 0);
-                    if(detailsUserVo != null && detailsUserVo.getAmStartTime() != null){
-                        startTime = queryDate.atTime(detailsUserVo.getAmStartTime());
-                    }
-                    endTime = queryDate.atTime(12, 0, 0);
-                    if(detailsUserVo != null && detailsUserVo.getAmEndTime() != null){
-                        endTime = queryDate.atTime(detailsUserVo.getAmEndTime());
-                    }
-                }else if(dto.getTimePeriod() != null && dto.getTimePeriod() == 2){
-                    startTime = queryDate.atTime(12, 0, 0);
-                    if(detailsUserVo != null && detailsUserVo.getPmStartTime() != null){
-                        startTime = queryDate.atTime(detailsUserVo.getPmStartTime());
-                    }
-                    endTime = queryDate.atTime(18, 0, 0);
-                    if(detailsUserVo != null && detailsUserVo.getPmEndTime() != null){
-                        endTime = queryDate.atTime(detailsUserVo.getPmEndTime());
-                    }
-                    amEndTime  = queryDate.atTime(12, 0, 0);
-                    if(detailsUserVo != null && detailsUserVo.getAmEndTime() != null){
-                        amEndTime = queryDate.atTime(detailsUserVo.getAmEndTime());
-                    }
-                }else{
-                    startTime = queryDate.atTime(0, 0, 0);
-                    if(detailsUserVo != null && detailsUserVo.getEveningStartTime() != null){
-                        startTime = queryDate.atTime(detailsUserVo.getEveningStartTime());
-                    }
-                    endTime = queryDate.atTime(23, 59, 59);
-                    if(detailsUserVo != null && detailsUserVo.getEveningEndTime() != null){
-                        endTime = queryDate.atTime(detailsUserVo.getEveningEndTime());
-                    }
-                }
-                
-                WfTeacherleave studentLeave = wfTeacherleaveService.getLeaveByUserId(startTime, endTime, record.getUserId());
-                if(studentLeave != null){
-                    record.setStatus(studentLeave.getLeaveType());
-                    continue;
-                }
-
-                WfHeadTeacherLeave teacherLeave = headTeacherLeaveService.selectJoinOne(WfHeadTeacherLeave.class,
-                        new MPJLambdaWrapper<WfHeadTeacherLeave>()
-                                .select(WfHeadTeacherLeave.class, x -> VoToColumnUtil.fieldsToColumns(WfHeadTeacherLeave.class).contains(x.getProperty()))
-                                .innerJoin(XjrUser.class, XjrUser::getId, WfHeadTeacherLeave::getApplicantUserId)
-                                .eq(WfHeadTeacherLeave::getStatus, 1)
-                                .eq(WfHeadTeacherLeave::getApplicantUserId, record.getUserId())
-                                .between(WfHeadTeacherLeave::getStartTime, startTime, endTime)
-                );
-                if(teacherLeave != null){
-                    record.setStatus(teacherLeave.getLeaveReason());
-                    continue;
-                }
-                TeacherOutInRecordDto outInDto = new TeacherOutInRecordDto();
-                outInDto.setQueryDate(startTime.toLocalDate());
-                outInDto.setRecordTime(endTime);
-                outInDto.setStatus(OutInStatusEnum.enter.getCode());
-                outInDto.setUserId(record.getUserId());
-                List<TeacherOutInRecord> outInRecords = teacherOutInRecordService.getListByParam(outInDto);
-                if(!outInRecords.isEmpty()){
-                    TeacherOutInRecord outInRecord = outInRecords.get(0);
-                    if(outInRecord != null){
-                        record.setRecordTime(outInRecord.getRecordTime());
-                        record.setStatus(outInRecord.getAttendanceStatus());
-                        record.setAttendanceMode("人脸");
-                    }
-                }else{
-                    //查询该教师是否通过车辆进入
-                    List<CarOutInRecord> list = carOutInRecordService.list(
-                            new MPJLambdaWrapper<CarOutInRecord>()
-                                    .select(CarOutInRecord.class, x -> VoToColumnUtil.fieldsToColumns(CarOutInRecord.class).contains(x.getProperty()))
-                                    .leftJoin(CarMessageApply.class, CarMessageApply::getId, CarOutInRecord::getCarMessageApplyId)
-                                    .le(CarOutInRecord::getRecordTime, endTime)
-                                    .eq("DATE_FORMAT(record_time, '%Y-%m-%d')", endTime.toLocalDate())
-                                    .eq(CarMessageApply::getUserId, record.getUserId())
-                                    .ge(dto.getTimePeriod() != null && dto.getTimePeriod() == 2 && amEndTime != null, CarOutInRecord::getRecordTime, amEndTime)
-                                    .eq(CarOutInRecord::getStatus, OutInStatusEnum.enter.getCode())
-                                    .orderByAsc(CarOutInRecord::getRecordTime)
-                    );
-                    if(!list.isEmpty()){
-                        CarOutInRecord outInRecord = list.get(0);
-                        if(outInRecord != null && outInRecord.getRecordTime().isBefore(startTime)){
-                            record.setRecordTime(outInRecord.getRecordTime());
-                            record.setStatus("到校");
-                            record.setAttendanceMode("车辆");
-                            record.setCarNumber(outInRecord.getPlanNo());
-                        }else if(outInRecord != null && outInRecord.getRecordTime().isAfter(startTime)){
-                            record.setRecordTime(outInRecord.getRecordTime());
-                            record.setStatus("迟到");
-                            record.setAttendanceMode("车辆");
-                            record.setCarNumber(outInRecord.getPlanNo());
-                        }
-                    }
-                }
-
-                if(record.getStatus() == null){
-                    record.setStatus("缺勤");
-                }
-            }
-        }
+        Page<TeacherStatisticsPageVo> voIPage = attendanceRecordService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<TeacherStatisticsPageVo> pageOutput = ConventPage.getPageOutput(voIPage, TeacherStatisticsPageVo.class);
         return RT.ok(pageOutput);
     }

src/main/java/com/xjrsoft/module/attendance/entity/TeacherAttendanceRecord.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -99,4 +100,7 @@ public class TeacherAttendanceRecord implements Serializable {
     @ApiModelProperty("考勤时间")
     private LocalDateTime recordTime;
 
+    @ApiModelProperty("考勤日期")
+    private LocalDate attendanceDate;
+
 }

src/main/java/com/xjrsoft/module/attendance/mapper/TeacherAttendanceRecordMapper.java

@@ -1,7 +1,12 @@
 package com.xjrsoft.module.attendance.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.attendance.dto.AttendanceStatisticsPageDto;
+import com.xjrsoft.module.attendance.dto.TeacherDetailsDto;
 import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
+import com.xjrsoft.module.attendance.vo.AttendanceStatisticsPageVo;
+import com.xjrsoft.module.attendance.vo.TeacherStatisticsPageVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -12,5 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface TeacherAttendanceRecordMapper extends MPJBaseMapper<TeacherAttendanceRecord> {
-
+    Page<TeacherStatisticsPageVo> getPage(Page<TeacherStatisticsPageVo> page, TeacherDetailsDto dto);
 }

src/main/java/com/xjrsoft/module/attendance/service/ITeacherAttendanceRecordService.java

@@ -1,7 +1,10 @@
 package com.xjrsoft.module.attendance.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.attendance.dto.TeacherDetailsDto;
 import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
+import com.xjrsoft.module.attendance.vo.TeacherStatisticsPageVo;
 
 /**
 * @title: 教师考勤记录
@@ -11,4 +14,6 @@ import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
 */
 
 public interface ITeacherAttendanceRecordService extends MPJBaseService<TeacherAttendanceRecord> {
+
+    Page<TeacherStatisticsPageVo> getPage(Page<TeacherStatisticsPageVo> page, TeacherDetailsDto dto);
 }

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

@@ -1,9 +1,12 @@
 package com.xjrsoft.module.attendance.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.attendance.dto.TeacherDetailsDto;
 import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
 import com.xjrsoft.module.attendance.mapper.TeacherAttendanceRecordMapper;
 import com.xjrsoft.module.attendance.service.ITeacherAttendanceRecordService;
+import com.xjrsoft.module.attendance.vo.TeacherStatisticsPageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -16,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 @AllArgsConstructor
 public class TeacherAttendanceRecordServiceImpl extends MPJBaseServiceImpl<TeacherAttendanceRecordMapper, TeacherAttendanceRecord> implements ITeacherAttendanceRecordService {
+    @Override
+    public Page<TeacherStatisticsPageVo> getPage(Page<TeacherStatisticsPageVo> page, TeacherDetailsDto dto) {
+        return this.getPage(page, dto);
+    }
 }

src/main/java/com/xjrsoft/module/job/AttendanceRecordTask.java

@@ -106,6 +106,7 @@ public class AttendanceRecordTask {
 
             TeacherAttendanceRecord record = new TeacherAttendanceRecord();
             record.setCreateDate(LocalDateTime.now());
+            record.setAttendanceDate(queryDate);
             record.setUserId(user.getId());
             record.setTimeInterval(timePeriod);
             AttendanceRuleDetailsUserVo detailsUserVo = teacherTodyRuleByUserId.get(user.getId());

src/main/resources/mapper/attendance/TeacherAttendanceRecordMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.attendance.mapper.TeacherAttendanceRecordMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.attendance.dto.TeacherDetailsDto" resultType="com.xjrsoft.module.attendance.vo.TeacherStatisticsPageVo">
+        SELECT t2.name AS teacher_name,t2.mobile,t1.attendance_status AS STATUS,t1.record_time,
+        t1.attendance_mode,t1.car_number,t1.user_id FROM teacher_attendance_record t1
+        INNER JOIN xjr_user t2 ON t1.user_id = t2.id
+        WHERE t1.delete_mark = 0
+        AND DATE_FORMAT(t1.attendance_date,'%Y-%m-%d') = #{dto.date}
+        AND t1.time_interval = #{dto.timePeriod}
+        <if test="dto.name != null and dto.name != ''">
+            t2.name like concat('%', #{dto.name},'%')
+        </if>
+        <if test="dto.credentialNumber != null and dto.credentialNumber != ''">
+            t2.credential_number like concat('%', #{dto.credentialNumber},'%')
+        </if>
+        <if test="dto.carNumber != null and dto.carNumber != ''">
+            t1.car_number like concat('%', #{dto.carNumber},'%')
+        </if>
+        <if test="dto.attendanceMode != null and dto.attendanceMode != ''">
+            t1.attendance_mode like concat('%', #{dto.attendanceMode},'%')
+        </if>
+    </select>
+</mapper>

src/test/java/com/xjrsoft/module/job/AttendanceRecordTaskTest.java

@@ -67,16 +67,16 @@ class AttendanceRecordTaskTest {
 
     @Test
     public void execute() {
-        //获取时间，并计算出前一天的开始时间和结束时间
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime startDateTime = now.plusDays(-1).withHour(0).withMinute(0).withSecond(0).withNano(0);
-        LocalDateTime endDateTime = startDateTime.plusDays(1).plusSeconds(-1);
 
-        //计算上午考勤
-        teacherAttendanceRecord(startDateTime, endDateTime, 1);
+        LocalDateTime now = LocalDateTime.of(2024, 10, 14, 0, 0, 0);
+        for (int i = 0; i < 7; i ++){
+            LocalDateTime startDateTime = now.plusDays(i).withHour(0).withMinute(0).withSecond(0).withNano(0);
+            LocalDateTime endDateTime = startDateTime.plusDays(i).withHour(23).withMinute(59).withSecond(59);
 
-        //计算上午考勤
-        //teacherAttendanceRecord(startDateTime, endDateTime, 2);
+            teacherAttendanceRecord(startDateTime, endDateTime, 1);
+
+            teacherAttendanceRecord(startDateTime, endDateTime, 2);
+        }
 
     }