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

# Conflicts:
#	src/main/java/com/xjrsoft/module/concat/controller/ConcatController.java
#	src/main/java/com/xjrsoft/module/personnel/controller/TeacherFaceProcessController.java

src/main/java/com/xjrsoft/common/utils/SqlRunnerAdapterUtil.java

@@ -1,6 +1,8 @@
 package com.xjrsoft.common.utils;
 
 import java.lang.reflect.Field;
+import java.sql.Time;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -97,4 +99,5 @@ public class SqlRunnerAdapterUtil {
 
         return dataList.toArray(new Integer[dataList.size()]);
     }
+
 }

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentTemplateController.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.assessment.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentPlanAnswerClassDto.java

@@ -2,14 +2,8 @@ package com.xjrsoft.module.assessment.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentPlanAnswerStudentDto.java

@@ -2,14 +2,8 @@ package com.xjrsoft.module.assessment.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentPlanQuestionDto.java

@@ -2,14 +2,8 @@ package com.xjrsoft.module.assessment.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentTemplatePlanDto.java

@@ -2,17 +2,10 @@ package com.xjrsoft.module.assessment.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
+import java.io.Serializable;
 import java.util.Date;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanQuestion;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanAnswerClass;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanAnswerStudent;
+import java.util.List;
 
 
 

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentPlanAnswerStudentDto.java

@@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-
 
 /**
 * @title: 考核答题提交入参

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentPlanAnswerSubmitDto.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.assessment.dto;
 
-import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentPlanSubmitDto.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.assessment.dto;
 
-import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentTemplatePlanPageDto.java

@@ -4,12 +4,6 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/assessment/dto/UpdateAssessmentTemplatePlanDto.java

@@ -2,17 +2,6 @@ package com.xjrsoft.module.assessment.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanQuestion;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanAnswerClass;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanAnswerStudent;
 
 
 

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentPlanAnswerClass.java

@@ -2,18 +2,14 @@ package com.xjrsoft.module.assessment.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentPlanAnswerStudent.java

@@ -2,18 +2,14 @@ package com.xjrsoft.module.assessment.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentPlanQuestion.java

@@ -4,16 +4,11 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentQuestion.java

@@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 
 /**

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentTemplatePlan.java

@@ -2,19 +2,17 @@ package com.xjrsoft.module.assessment.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
 
 
 /**

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentPlanAnswerStudentMapper.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.assessment.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanSureDto;
 import com.xjrsoft.module.assessment.entity.AssessmentPlanAnswerStudent;

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentPlanQuestionMapper.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.assessment.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.assessment.entity.AssessmentPlanQuestion;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanAnswerClassVo.java

@@ -3,12 +3,6 @@ package com.xjrsoft.module.assessment.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 考核计划答题参与班级表单出参
 * @Author dzx

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanAnswerStudentVo.java

@@ -3,12 +3,6 @@ package com.xjrsoft.module.assessment.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 考核计划答题参与学生表单出参
 * @Author dzx

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanQuestionVo.java

@@ -3,12 +3,6 @@ package com.xjrsoft.module.assessment.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 考核模板题目表单出参
 * @Author dzx

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentQuestionOptionResultVo.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
 * @title: 考核题目答案出参

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentQuestionVo.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.assessment.vo;
 
 import com.xjrsoft.common.model.tree.ITreeNode;
-import com.xjrsoft.module.asset.vo.PlaceTreeVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentTemplatePlanVo.java

@@ -3,14 +3,7 @@ package com.xjrsoft.module.assessment.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanQuestion;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanAnswerClass;
-import com.xjrsoft.module.assessment.entity.AssessmentPlanAnswerStudent;
 
 /**
 * @title: 考核计划表单出参

src/main/java/com/xjrsoft/module/asset/controller/WfAssetManageController.java

@@ -3,7 +3,6 @@ package com.xjrsoft.module.asset.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
@@ -11,7 +10,11 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.asset.dto.*;
+import com.xjrsoft.module.asset.dto.AddWfAssetManageDto;
+import com.xjrsoft.module.asset.dto.UpdateWfAssetManageDto;
+import com.xjrsoft.module.asset.dto.WfAssetManageConditionalSearchQueryDto;
+import com.xjrsoft.module.asset.dto.WfAssetManagePageDto;
+import com.xjrsoft.module.asset.dto.WfAssetManageSelectRecordQueryDto;
 import com.xjrsoft.module.asset.entity.WfAssetManage;
 import com.xjrsoft.module.asset.service.IWfAssetManageService;
 import com.xjrsoft.module.asset.vo.BaseOfficeBuildVo;
@@ -22,18 +25,21 @@ import com.xjrsoft.module.base.entity.BaseClassroom;
 import com.xjrsoft.module.base.entity.BaseOfficeBuild;
 import com.xjrsoft.module.base.service.IBaseClassroomService;
 import com.xjrsoft.module.base.service.IBaseOfficeBuildService;
-import com.xjrsoft.module.oa.entity.WfOaPull;
-import com.xjrsoft.module.oa.vo.FileReceivePullPageVo;
 import com.xjrsoft.module.organization.entity.Department;
-import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.teacher.entity.XjrUser;
-import com.xjrsoft.module.textbook.dto.TextbookClaimExportQueryDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;

src/main/java/com/xjrsoft/module/asset/controller/WfAssetManageInventoryController.java

@@ -1,41 +1,40 @@
 package com.xjrsoft.module.asset.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.asset.dto.AddWfAssetManageInventoryDto;
 import com.xjrsoft.module.asset.dto.UpdateWfAssetManageInventoryDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.alibaba.excel.EasyExcel;
-import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
-import com.alibaba.excel.support.ExcelTypeEnum;
-import org.springframework.http.ResponseEntity;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-
 import com.xjrsoft.module.asset.dto.WfAssetManageInventoryPageDto;
 import com.xjrsoft.module.asset.entity.WfAssetManageInventory;
 import com.xjrsoft.module.asset.service.IWfAssetManageInventoryService;
 import com.xjrsoft.module.asset.vo.WfAssetManageInventoryPageVo;
-
 import com.xjrsoft.module.asset.vo.WfAssetManageInventoryVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/module/asset/dto/AddWfAssetManageDto.java

@@ -2,14 +2,9 @@ package com.xjrsoft.module.asset.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
+import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
 
 
 

src/main/java/com/xjrsoft/module/asset/dto/AddWfAssetManageInventoryDto.java

@@ -2,14 +2,8 @@ package com.xjrsoft.module.asset.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

src/main/java/com/xjrsoft/module/asset/dto/UpdateWfAssetManageDto.java

@@ -2,14 +2,6 @@ package com.xjrsoft.module.asset.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

src/main/java/com/xjrsoft/module/asset/dto/UpdateWfAssetManageInventoryDto.java

@@ -2,14 +2,6 @@ package com.xjrsoft.module.asset.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

src/main/java/com/xjrsoft/module/asset/dto/WfAssetManageConditionalSearchQueryDto.java

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 
 /**
 * @title: 资产管理分页查询入参

src/main/java/com/xjrsoft/module/asset/dto/WfAssetManageInventoryPageDto.java

@@ -1,15 +1,8 @@
 package com.xjrsoft.module.asset.dto;
 
 import com.xjrsoft.common.page.PageInput;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/asset/dto/WfAssetManagePageDto.java

@@ -4,12 +4,6 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/asset/dto/WfAssetManageSelectRecordQueryDto.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.asset.dto;
 
-import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/xjrsoft/module/asset/entity/WfAssetManage.java

@@ -2,18 +2,15 @@ package com.xjrsoft.module.asset.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

src/main/java/com/xjrsoft/module/asset/entity/WfAssetManageInventory.java

@@ -2,18 +2,14 @@ package com.xjrsoft.module.asset.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

src/main/java/com/xjrsoft/module/asset/mapper/WfAssetManageInventoryMapper.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.asset.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.asset.entity.WfAssetManageInventory;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/xjrsoft/module/asset/mapper/WfAssetManageMapper.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.asset.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.asset.dto.WfAssetManageConditionalSearchQueryDto;
 import com.xjrsoft.module.asset.dto.WfAssetManagePageDto;
@@ -12,7 +11,6 @@ import com.xjrsoft.module.asset.vo.WfAssetManageQueryVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.io.ByteArrayOutputStream;
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/module/asset/service/IWfAssetManageInventoryService.java

@@ -1,10 +1,7 @@
 package com.xjrsoft.module.asset.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.asset.entity.WfAssetManageInventory;
-import lombok.Data;
-import java.util.List;
 
 /**
 * @title: 资产管理盘点

src/main/java/com/xjrsoft/module/asset/service/IWfAssetManageService.java

@@ -1,17 +1,14 @@
 package com.xjrsoft.module.asset.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.asset.dto.WfAssetManageConditionalSearchQueryDto;
 import com.xjrsoft.module.asset.dto.WfAssetManagePageDto;
 import com.xjrsoft.module.asset.dto.WfAssetManageSelectRecordQueryDto;
 import com.xjrsoft.module.asset.entity.WfAssetManage;
 import com.xjrsoft.module.asset.vo.WfAssetManagePageVo;
-import lombok.Data;
 
 import java.io.ByteArrayOutputStream;
-import java.util.List;
 
 /**
 * @title: 资产管理

src/main/java/com/xjrsoft/module/asset/service/impl/WfAssetManageInventoryServiceImpl.java

@@ -11,8 +11,6 @@ import com.xjrsoft.module.asset.entity.WfAssetManageInventory;
 import com.xjrsoft.module.asset.mapper.WfAssetManageInventoryMapper;
 import com.xjrsoft.module.asset.service.IWfAssetManageInventoryService;
 import com.xjrsoft.module.asset.service.IWfAssetManageService;
-import com.xjrsoft.module.asset.vo.BaseOfficeBuildVo;
-import com.xjrsoft.module.base.entity.BaseOfficeBuild;
 import com.xjrsoft.module.concat.service.IXjrUserService;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.entity.Role;

src/main/java/com/xjrsoft/module/asset/service/impl/WfAssetManageServiceImpl.java

@@ -22,7 +22,6 @@ import org.springframework.stereotype.Service;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

src/main/java/com/xjrsoft/module/asset/vo/WfAssetManageInventoryPageVo.java

@@ -1,17 +1,10 @@
 package com.xjrsoft.module.asset.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

src/main/java/com/xjrsoft/module/asset/vo/WfAssetManageInventoryVo.java

@@ -3,12 +3,6 @@ package com.xjrsoft.module.asset.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 资产管理盘点表单出参
 * @Author szs

src/main/java/com/xjrsoft/module/asset/vo/WfAssetManagePageVo.java

@@ -1,16 +1,10 @@
 package com.xjrsoft.module.asset.vo;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
 * @title: 资产管理分页列表出参

src/main/java/com/xjrsoft/module/asset/vo/WfAssetManageVo.java

@@ -3,11 +3,7 @@ package com.xjrsoft.module.asset.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
 import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
 
 /**
 * @title: 资产管理表单出参

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

@@ -1,28 +1,22 @@
 package com.xjrsoft.module.attendance.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.MPJWrappers;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.attendance.dto.AddAttendanceMessageSetDto;
 import com.xjrsoft.module.attendance.dto.AttendanceMessageSetDto;
-import com.xjrsoft.module.attendance.dto.UpdateAttendanceMessageSetDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.attendance.dto.AttendanceMessageSetPageDto;
+import com.xjrsoft.module.attendance.dto.UpdateAttendanceMessageSetDto;
 import com.xjrsoft.module.attendance.entity.AttendanceMessageSet;
 import com.xjrsoft.module.attendance.service.IAttendanceMessageSetService;
 import com.xjrsoft.module.attendance.vo.AttendanceMessageSetPageVo;
-
 import com.xjrsoft.module.attendance.vo.AttendanceMessageSetVo;
 import com.xjrsoft.module.attendance.vo.AttendanceMessageUserRelationVo;
 import com.xjrsoft.module.base.entity.BaseClass;
@@ -34,10 +28,16 @@ import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -1,33 +1,25 @@
 package com.xjrsoft.module.attendance.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.attendance.dto.AddStudentAttendanceRecordDto;
 import com.xjrsoft.module.attendance.dto.StudentAttendanceRecordClassPageDto;
-import com.xjrsoft.module.attendance.dto.UpdateStudentAttendanceRecordDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.attendance.dto.StudentAttendanceRecordPageDto;
+import com.xjrsoft.module.attendance.dto.UpdateStudentAttendanceRecordDto;
 import com.xjrsoft.module.attendance.entity.StudentAttendanceRecord;
-import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
 import com.xjrsoft.module.attendance.service.IStudentAttendanceRecordService;
 import com.xjrsoft.module.attendance.vo.StudentAttendanceRecordClassPageVo;
 import com.xjrsoft.module.attendance.vo.StudentAttendanceRecordPageVo;
-
 import com.xjrsoft.module.attendance.vo.StudentAttendanceRecordVo;
-import com.xjrsoft.module.attendance.vo.TeacherAttendanceRecordPageVo;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.outint.entity.TeacherOutInRecord;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
@@ -35,10 +27,16 @@ import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

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

@@ -13,6 +13,7 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.attendance.dto.AttendanceStatisticDto;
 import com.xjrsoft.module.attendance.dto.StudentDetailsDto;
+import com.xjrsoft.module.attendance.service.IAttendanceRuleCategoryService;
 import com.xjrsoft.module.attendance.vo.ClassStatisticsVo;
 import com.xjrsoft.module.attendance.vo.StudentStatisticsPageVo;
 import com.xjrsoft.module.base.entity.BaseClass;
@@ -68,6 +69,7 @@ public class StudentStatisticsController {
     private final IStudentLeaveService studentLeaveService;
     private final IBaseClassService classService;
     private final IHolidayDateService holidayDateService;
+    private final IAttendanceRuleCategoryService ruleCategoryService;
 
     @GetMapping(value = "/class-statistics")
     @ApiOperation(value="班级考勤统计")

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

@@ -1,41 +1,40 @@
 package com.xjrsoft.module.attendance.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.attendance.dto.AddTeacherAttendanceRecordDto;
-import com.xjrsoft.module.attendance.dto.UpdateTeacherAttendanceRecordDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.attendance.dto.TeacherAttendanceRecordPageDto;
+import com.xjrsoft.module.attendance.dto.UpdateTeacherAttendanceRecordDto;
 import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
 import com.xjrsoft.module.attendance.service.ITeacherAttendanceRecordService;
 import com.xjrsoft.module.attendance.vo.TeacherAttendanceRecordPageVo;
-
 import com.xjrsoft.module.attendance.vo.TeacherAttendanceRecordVo;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.outint.entity.TeacherOutInRecord;
-import com.xjrsoft.module.outint.vo.TeacherOutInRecordPageVo;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

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

@@ -9,7 +9,10 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 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.service.IAttendanceRuleCategoryService;
+import com.xjrsoft.module.attendance.vo.AttendanceRuleDetailsUserVo;
 import com.xjrsoft.module.attendance.vo.TeacherStatisticsPageVo;
 import com.xjrsoft.module.holiday.entity.HolidayDate;
 import com.xjrsoft.module.holiday.service.IHolidayDateService;
@@ -22,6 +25,7 @@ import com.xjrsoft.module.outint.service.ITeacherOutInRecordService;
 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;
@@ -35,9 +39,9 @@ import javax.validation.Valid;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
 * @title: 教师考勤
@@ -57,7 +61,7 @@ public class TeacherStatisticsController {
     private final IWfTeacherleaveService wfTeacherleaveService;
     private final IHolidayDateService holidayDateService;
     private final IWfHeadTeacherLeaveService headTeacherLeaveService;
-
+    private final IAttendanceRuleCategoryService attendanceRuleCategoryService;
 
     @GetMapping(value = "/teacher-details")
     @ApiOperation(value="教师考勤")
@@ -88,55 +92,95 @@ public class TeacherStatisticsController {
                 return RT.ok(ConventPage.getPageOutput(voIPage, TeacherStatisticsPageVo.class));
             }
 
-            LocalDateTime startTime, endTime;
-
-            if(dto.getTimePeriod() == 1){
-                startTime = queryDate.atTime(5, 0, 0);
-                endTime = queryDate.atTime(12, 0, 0);
-            }else if(dto.getTimePeriod() == 2){
-                startTime = queryDate.atTime(12, 0, 0);
-                endTime = queryDate.atTime(18, 0, 0);
-            }else{
-                startTime = queryDate.atTime(0, 0, 0);
-                endTime = queryDate.atTime(23, 59, 59);
-            }
-
-            //查询当前时间段存在请假的教师
-            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);
-            }
+            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()) {
-                WfTeacherleave studentLeave = leaveList.get(record.getUserId());
+                LocalDateTime startTime, endTime;
+                AttendanceRuleDetailsUserVo detailsUserVo = teacherTodyRuleByUserId.get(record.getUserId());
+                if(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() == 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());
+                    }
+                }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 = teacherLeaveMap.get(record.getUserId());
+
+                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;
                 }
-                TeacherOutInRecord outInRecord = outInMap.get(record.getUserId());
-                if(outInRecord != null){
-                    record.setRecordTime(outInRecord.getRecordTime());
-                    record.setStatus(outInRecord.getAttendanceStatus());
-                }else{
+                List<TeacherOutInRecord> outInRecords = teacherOutInRecordService.list(
+                    new QueryWrapper<TeacherOutInRecord>().lambda()
+                            .between(TeacherOutInRecord::getRecordTime, startTime, endTime)
+                            .eq(TeacherOutInRecord::getStatus, 1)
+                            .eq(TeacherOutInRecord::getUserId, record.getUserId())
+                            .orderByAsc(TeacherOutInRecord::getRecordTime)
+                );
+                if(!outInRecords.isEmpty()){
+                    TeacherOutInRecord outInRecord = outInRecords.get(0);
+                    if(outInRecord != null){
+                        record.setRecordTime(outInRecord.getRecordTime());
+                        record.setStatus(outInRecord.getAttendanceStatus());
+                    }
+                }
+                if(record.getStatus() == null){
                     record.setStatus("缺勤");
                 }
+
             }
         }
         PageOutput<TeacherStatisticsPageVo> pageOutput = ConventPage.getPageOutput(voIPage, TeacherStatisticsPageVo.class);

src/main/java/com/xjrsoft/module/attendance/dto/AddAttendanceMessageSetDto.java

@@ -2,15 +2,9 @@ package com.xjrsoft.module.attendance.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
+import java.io.Serializable;
 import java.util.List;
-import java.util.Date;
-import com.xjrsoft.module.attendance.entity.AttendanceMessageUserRelation;
 
 
 

src/main/java/com/xjrsoft/module/attendance/dto/AddAttendanceMessageUserRelationDto.java

@@ -2,14 +2,8 @@ package com.xjrsoft.module.attendance.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

src/main/java/com/xjrsoft/module/attendance/dto/AddAttendanceRuleCategoryDto.java

@@ -5,7 +5,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 
 

src/main/java/com/xjrsoft/module/attendance/dto/AddStudentAttendanceRecordDto.java

@@ -2,14 +2,8 @@ package com.xjrsoft.module.attendance.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

src/main/java/com/xjrsoft/module/attendance/dto/AddTeacherAttendanceRecordDto.java

@@ -2,14 +2,8 @@ package com.xjrsoft.module.attendance.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

src/main/java/com/xjrsoft/module/attendance/dto/AttendanceMessageSetPageDto.java

@@ -1,15 +1,8 @@
 package com.xjrsoft.module.attendance.dto;
 
 import com.xjrsoft.common.page.PageInput;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/attendance/dto/AttendanceStatisticDto.java

@@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.time.LocalDate;
-
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class AttendanceStatisticDto extends PageInput {

src/main/java/com/xjrsoft/module/attendance/dto/StudentAttendanceRecordPageDto.java

@@ -5,12 +5,8 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalTime;
 import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/attendance/dto/TeacherAttendanceRecordPageDto.java

@@ -5,12 +5,8 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalTime;
 import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/attendance/dto/UpdateAttendanceMessageSetDto.java

@@ -5,15 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
-import com.xjrsoft.module.attendance.entity.AttendanceMessageUserRelation;
 
 
 

src/main/java/com/xjrsoft/module/attendance/dto/UpdateStudentAttendanceRecordDto.java

@@ -2,14 +2,6 @@ package com.xjrsoft.module.attendance.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

src/main/java/com/xjrsoft/module/attendance/dto/UpdateTeacherAttendanceRecordDto.java

@@ -2,14 +2,6 @@ package com.xjrsoft.module.attendance.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

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

@@ -2,19 +2,17 @@ package com.xjrsoft.module.attendance.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
 
 
 /**

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

@@ -2,18 +2,14 @@ package com.xjrsoft.module.attendance.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

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

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalTime;
+import java.sql.Time;
 import java.util.Date;
 
 
@@ -114,12 +114,12 @@ public class AttendanceRuleDetails implements Serializable {
     * 上午上学时间
     */
     @ApiModelProperty("上午上学时间")
-    private LocalTime amStartTime;
+    private Time amStartTime;
     /**
     * 上午放学时间
     */
     @ApiModelProperty("上午放学时间")
-    private LocalTime amEndTime;
+    private Time amEndTime;
     /**
     * 上午迟到旷课分钟数
     */
@@ -134,12 +134,12 @@ public class AttendanceRuleDetails implements Serializable {
     * 上午为节假日前一天时上学时间
     */
     @ApiModelProperty("上午为节假日前一天时上学时间")
-    private LocalTime amHolidaysStartTime;
+    private Time amHolidaysStartTime;
     /**
     * 上午为节假日前一天时放学时间
     */
     @ApiModelProperty("上午为节假日前一天时放学时间")
-    private LocalTime amHolidaysEndTime;
+    private Time amHolidaysEndTime;
     /**
     * 下午是否启用（1：是 0：否）
     */
@@ -149,12 +149,12 @@ public class AttendanceRuleDetails implements Serializable {
     * 下午上学时间
     */
     @ApiModelProperty("下午上学时间")
-    private LocalTime pmStartTime;
+    private Time pmStartTime;
     /**
     * 下午放学时间
     */
     @ApiModelProperty("下午放学时间")
-    private LocalTime pmEndTime;
+    private Time pmEndTime;
     /**
     * 下午迟到旷课分钟数
     */
@@ -169,12 +169,12 @@ public class AttendanceRuleDetails implements Serializable {
     * 下午为节假日前一天时上学时间
     */
     @ApiModelProperty("下午为节假日前一天时上学时间")
-    private LocalTime pmHolidaysStartTime;
+    private Time pmHolidaysStartTime;
     /**
     * 下午为节假日前一天时放学时间
     */
     @ApiModelProperty("下午为节假日前一天时放学时间")
-    private LocalTime pmHolidaysEndTime;
+    private Time pmHolidaysEndTime;
     /**
     * 晚上是否启用（1：是 0：否）
     */
@@ -184,12 +184,12 @@ public class AttendanceRuleDetails implements Serializable {
     * 晚上上学时间
     */
     @ApiModelProperty("晚上上学时间")
-    private LocalTime eveningStartTime;
+    private Time eveningStartTime;
     /**
     * 晚上放学时间
     */
     @ApiModelProperty("晚上放学时间")
-    private LocalTime eveningEndTime;
+    private Time eveningEndTime;
     /**
     * 晚上迟到旷课分钟数
     */
@@ -204,12 +204,12 @@ public class AttendanceRuleDetails implements Serializable {
     * 晚上为节假日前一天时上学时间
     */
     @ApiModelProperty("晚上为节假日前一天时上学时间")
-    private LocalTime eveningHolidaysStartTime;
+    private Time eveningHolidaysStartTime;
     /**
     * 晚上为节假日前一天时放学时间
     */
     @ApiModelProperty("晚上为节假日前一天时放学时间")
-    private LocalTime eveningHolidaysEndTime;
+    private Time eveningHolidaysEndTime;
     /**
     * 考勤规则(attendance_rule_category)
     */
@@ -221,14 +221,14 @@ public class AttendanceRuleDetails implements Serializable {
     private Integer holidaysLastDayInOut;
 
     @ApiModelProperty("返校上学时间")
-    private LocalTime returnStartTime;
+    private Time returnStartTime;
 
     @ApiModelProperty("返校放学时间")
-    private LocalTime returnEndTime;
+    private Time returnEndTime;
 
     @ApiModelProperty("节假日迟到旷课时间")
-    private Integer holidaysLateMinutes;
+    private Time holidaysLateMinutes;
 
     @ApiModelProperty("为节假日前一天时放学时间")
-    private LocalTime holidaysEndTime;
+    private Time holidaysEndTime;
 }

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 
@@ -91,4 +92,12 @@ public class AttendanceUserRelation implements Serializable {
     private Long attendanceRuleCategoryId;
 
 
+    @ApiModelProperty("考勤状态")
+    private String attendanceStatus;
+
+
+    @ApiModelProperty("最新考勤时间")
+    private LocalDateTime attendanceTime;
+
+
 }

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

@@ -2,18 +2,14 @@ package com.xjrsoft.module.attendance.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

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

@@ -2,18 +2,14 @@ package com.xjrsoft.module.attendance.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

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

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.attendance.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.attendance.entity.AttendanceMessageSet;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.attendance.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.attendance.entity.AttendanceMessageUserRelation;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -7,8 +7,6 @@ import com.xjrsoft.module.attendance.entity.AttendanceRuleCategory;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
 * @title: 考勤规则
 * @Author dzx

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

@@ -22,4 +22,7 @@ public interface AttendanceRuleDetailsMapper extends MPJBaseMapper<AttendanceRul
 
     List<AttendanceRuleDetailsUserVo> getAllStudentTodyRule(@Param("dayOfWeek") String dayOfWeek);
 
+
+    List<AttendanceRuleDetailsUserVo> getTodayRulesByUserId(@Param("dayOfWeek") String dayOfWeek, @Param("userIds")List<Long> userIds);
+
 }

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

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.attendance.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.attendance.entity.StudentAttendanceRecord;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.attendance.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -1,10 +1,9 @@
 package com.xjrsoft.module.attendance.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.attendance.dto.UpdateAttendanceMessageSetDto;
 import com.xjrsoft.module.attendance.entity.AttendanceMessageSet;
-import lombok.Data;
+
 import java.util.List;
 
 /**

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

@@ -6,7 +6,9 @@ import com.xjrsoft.module.attendance.dto.UpdateAttendanceRuleCategoryDto;
 import com.xjrsoft.module.attendance.entity.AttendanceRuleCategory;
 import com.xjrsoft.module.attendance.entity.AttendanceRuleDetails;
 import com.xjrsoft.module.attendance.vo.AttendanceRuleDetailsUserVo;
+import com.xjrsoft.module.attendance.vo.TimeRangeVo;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -55,4 +57,8 @@ public interface IAttendanceRuleCategoryService extends MPJBaseService<Attendanc
 
     Map<String, Map<Long, AttendanceRuleDetailsUserVo>> getAllStudentTodyRule(List<String> dayOfWeek);
 
+    Map<Long, AttendanceRuleDetailsUserVo> getTeacherTodyRuleByUserId(List<Long> teacherIds);
+
+    List<TimeRangeVo> getAllTimeRange(LocalDateTime startTime, LocalDateTime endTime);
+
 }

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

@@ -1,10 +1,7 @@
 package com.xjrsoft.module.attendance.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.attendance.entity.StudentAttendanceRecord;
-import lombok.Data;
-import java.util.List;
 
 /**
 * @title: 学生考勤记录

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

@@ -1,10 +1,7 @@
 package com.xjrsoft.module.attendance.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
-import lombok.Data;
-import java.util.List;
 
 /**
 * @title: 教师考勤记录

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

@@ -1,22 +1,21 @@
 package com.xjrsoft.module.attendance.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.attendance.dto.UpdateAttendanceMessageSetDto;
-import com.xjrsoft.module.attendance.entity.AttendanceMessageUserRelation;
-import com.xjrsoft.module.attendance.mapper.AttendanceMessageUserRelationMapper;
 import com.xjrsoft.module.attendance.entity.AttendanceMessageSet;
+import com.xjrsoft.module.attendance.entity.AttendanceMessageUserRelation;
 import com.xjrsoft.module.attendance.mapper.AttendanceMessageSetMapper;
+import com.xjrsoft.module.attendance.mapper.AttendanceMessageUserRelationMapper;
 import com.xjrsoft.module.attendance.service.IAttendanceMessageSetService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 /**
 * @title: 考勤消息设置

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

@@ -20,6 +20,7 @@ import com.xjrsoft.module.attendance.mapper.AttendanceRuleDetailsMapper;
 import com.xjrsoft.module.attendance.mapper.AttendanceUserRelationMapper;
 import com.xjrsoft.module.attendance.service.IAttendanceRuleCategoryService;
 import com.xjrsoft.module.attendance.vo.AttendanceRuleDetailsUserVo;
+import com.xjrsoft.module.attendance.vo.TimeRangeVo;
 import com.xjrsoft.module.concat.service.IXjrUserService;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.student.entity.BaseStudent;
@@ -33,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.DayOfWeek;
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -478,4 +480,38 @@ public class AttendanceRuleCategoryServiceImpl extends MPJBaseServiceImpl<Attend
 
         return result;
     }
+
+    /**
+     * 查询教师的当前的考勤规则
+     */
+    @Override
+    public Map<Long, AttendanceRuleDetailsUserVo> getTeacherTodyRuleByUserId(List<Long> teacherIds) {
+        LocalDateTime now = LocalDateTime.now();
+        DayOfWeek dayOfWeek = now.getDayOfWeek();
+        List<AttendanceRuleDetailsUserVo> todayRulesByUserId = detailsMapper.getTodayRulesByUserId(dayOfWeek.name(), teacherIds);
+        Map<Long, AttendanceRuleDetailsUserVo> dataMap = new HashMap<>();
+        for (AttendanceRuleDetailsUserVo userVo : todayRulesByUserId) {
+            dataMap.put(userVo.getUserId(), userVo);
+        }
+        return dataMap;
+    }
+
+    @Override
+    public List<TimeRangeVo> getAllTimeRange(LocalDateTime startTime, LocalDateTime endTime) {
+        long between = ChronoUnit.DAYS.between(startTime, endTime);
+        List<String> dayOfWeeks = new ArrayList<>();
+        Map<String, LocalDateTime> timeMap = new HashMap<>();
+        for (int i = 0; i <= between; i ++) {
+            String name = startTime.plusDays(i).getDayOfWeek().name();
+            dayOfWeeks.add(name);
+            timeMap.put(name, startTime.plusDays(i));
+        }
+
+        List<AttendanceRuleDetails> detailsList = detailsMapper.selectList(
+                new QueryWrapper<AttendanceRuleDetails>().lambda()
+                        .in(AttendanceRuleDetails::getDateType, dayOfWeeks)
+        );
+
+        return null;
+    }
 }

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

@@ -1,17 +1,11 @@
 package com.xjrsoft.module.attendance.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.attendance.entity.StudentAttendanceRecord;
 import com.xjrsoft.module.attendance.mapper.StudentAttendanceRecordMapper;
 import com.xjrsoft.module.attendance.service.IStudentAttendanceRecordService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 /**
 * @title: 学生考勤记录

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

@@ -1,17 +1,11 @@
 package com.xjrsoft.module.attendance.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
 import com.xjrsoft.module.attendance.mapper.TeacherAttendanceRecordMapper;
 import com.xjrsoft.module.attendance.service.ITeacherAttendanceRecordService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 /**
 * @title: 教师考勤记录

src/main/java/com/xjrsoft/module/attendance/vo/AttendanceMessageSetPageVo.java

@@ -1,14 +1,8 @@
 package com.xjrsoft.module.attendance.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

src/main/java/com/xjrsoft/module/attendance/vo/AttendanceMessageSetVo.java

@@ -3,12 +3,7 @@ package com.xjrsoft.module.attendance.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.List;
-import java.util.Date;
-import com.xjrsoft.module.attendance.entity.AttendanceMessageUserRelation;
 
 /**
 * @title: 考勤消息设置表单出参

src/main/java/com/xjrsoft/module/attendance/vo/AttendanceMessageUserRelationVo.java

@@ -3,12 +3,6 @@ package com.xjrsoft.module.attendance.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 考勤消息提醒人员表单出参
 * @Author dzx

src/main/java/com/xjrsoft/module/attendance/vo/StudentAttendanceRecordPageVo.java

@@ -1,14 +1,8 @@
 package com.xjrsoft.module.attendance.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

src/main/java/com/xjrsoft/module/attendance/vo/StudentAttendanceRecordVo.java

@@ -3,12 +3,6 @@ package com.xjrsoft.module.attendance.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 学生考勤记录表单出参
 * @Author dzx

src/main/java/com/xjrsoft/module/attendance/vo/TeacherAttendanceRecordPageVo.java

@@ -1,14 +1,8 @@
 package com.xjrsoft.module.attendance.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

src/main/java/com/xjrsoft/module/attendance/vo/TeacherAttendanceRecordVo.java

@@ -3,12 +3,6 @@ package com.xjrsoft.module.attendance.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 教师考勤记录表单出参
 * @Author dzx

src/main/java/com/xjrsoft/module/attendance/vo/TeacherStatisticsVo.java

@@ -3,8 +3,6 @@ package com.xjrsoft.module.attendance.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-
 /**
 * @title: 教职工统计
 * @Author dzx

src/main/java/com/xjrsoft/module/attendance/vo/TimeRangeVo.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.attendance.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+* @title: 考勤时间段
+* @Author dzx
+* @Date: 2024年6月17日
+* @Version 1.0
+*/
+@Data
+public class TimeRangeVo {
+
+    @ApiModelProperty("开始时间")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty("结束时间")
+    private LocalDateTime endTime;
+
+    @ApiModelProperty("时段（1=上午 2=下午 3=晚上）")
+    private Integer timePeriod;
+
+}

src/main/java/com/xjrsoft/module/authority/utils/AuthorityUtil.java

@@ -13,14 +13,23 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.xjrsoft.common.constant.GlobalConstant;
-import com.xjrsoft.common.enums.*;
+import com.xjrsoft.common.enums.DataAuthConditionTypeEnum;
+import com.xjrsoft.common.enums.DataAuthFieldTypeEnum;
+import com.xjrsoft.common.enums.DataAuthMethodEnum;
+import com.xjrsoft.common.enums.DataAuthScopeEnum;
+import com.xjrsoft.common.enums.DataAuthTypeEnum;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.module.authority.entity.DataAuth;
 import com.xjrsoft.module.authority.entity.DataAuthConfig;
 import com.xjrsoft.module.authority.entity.DataAuthRelation;
 import com.xjrsoft.module.authority.entity.DataAuthTableRelation;
-import com.xjrsoft.module.organization.entity.*;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.organization.entity.Post;
+import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.organization.entity.UserDeptRelation;
+import com.xjrsoft.module.organization.entity.UserPostRelation;
+import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import lombok.SneakyThrows;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
@@ -28,7 +37,15 @@ import net.sf.jsqlparser.expression.Parenthesis;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
-import net.sf.jsqlparser.expression.operators.relational.*;
+import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
+import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
+import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
+import net.sf.jsqlparser.expression.operators.relational.InExpression;
+import net.sf.jsqlparser.expression.operators.relational.LikeExpression;
+import net.sf.jsqlparser.expression.operators.relational.MinorThan;
+import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
+import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.schema.Column;
 

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

@@ -4,15 +4,23 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 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.base.dto.*;
-import com.xjrsoft.module.base.entity.*;
+import com.xjrsoft.module.base.dto.AddBaseClassCourseDto;
+import com.xjrsoft.module.base.dto.BaseClassCourseListDto;
+import com.xjrsoft.module.base.dto.BaseClassCoursePageDto;
+import com.xjrsoft.module.base.dto.ClassCourseReuseDto;
+import com.xjrsoft.module.base.dto.UpdateBaseClassCourseDto;
+import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.entity.BaseClassCourse;
+import com.xjrsoft.module.base.entity.BaseCourseSubject;
+import com.xjrsoft.module.base.entity.BaseSemester;
+import com.xjrsoft.module.base.entity.ClassCourseTextbook;
+import com.xjrsoft.module.base.entity.CourseBookInfo;
 import com.xjrsoft.module.base.service.IBaseClassCourseService;
 import com.xjrsoft.module.base.service.impl.BaseCourseSubjectServiceImpl;
 import com.xjrsoft.module.base.vo.BaseClassCourseExportListVo;
@@ -20,22 +28,30 @@ import com.xjrsoft.module.base.vo.BaseClassCourseListVo;
 import com.xjrsoft.module.base.vo.BaseClassCoursePageVo;
 import com.xjrsoft.module.base.vo.BaseClassCourseVo;
 import com.xjrsoft.module.textbook.entity.Textbook;
-import com.xjrsoft.module.textbook.entity.TextbookStudentClaim;
 import com.xjrsoft.module.textbook.service.impl.TextbookServiceImpl;
-import com.xjrsoft.module.textbook.vo.TextbookStudentClaimPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @title: 班级课程

src/main/java/com/xjrsoft/module/base/dto/AddBaseClassCourseDto.java

@@ -2,14 +2,8 @@ package com.xjrsoft.module.base.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

src/main/java/com/xjrsoft/module/base/dto/AddBaseClassPageDto.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @author dzx

src/main/java/com/xjrsoft/module/base/dto/BaseClassCourseListDto.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.base.dto;
 
-import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/xjrsoft/module/base/dto/BaseClassCoursePageDto.java

@@ -4,12 +4,6 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/base/dto/BaseClassPageDto.java

@@ -4,8 +4,6 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * @author dzx
  * @date 2024年4月28日

src/main/java/com/xjrsoft/module/base/dto/UpdateBaseClassCourseDto.java

@@ -2,14 +2,6 @@ package com.xjrsoft.module.base.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;