Merge branch 'pre'

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

@@ -476,6 +476,7 @@ public class AttendanceStatisticsServiceImpl extends MPJBaseServiceImpl<Attendan
                 }
             }
             dataList.add(data);
+            sortCode ++;
         }
 
         int allColumn = 8 + statistics.getAttendanceDays();//总列数
@@ -487,7 +488,7 @@ public class AttendanceStatisticsServiceImpl extends MPJBaseServiceImpl<Attendan
         // 第一行表头
         createFirstTitle(workbook, sheet, allColumn - 1);
         // 第二行表头
-        createSecondTitle(workbook, sheet, statistics, 3);
+        createSecondTitle(workbook, sheet, statistics, 7);
         // 第三行表头
         createThirdTitle(workbook, sheet, weekList);
         // 第四行表头
@@ -498,7 +499,9 @@ public class AttendanceStatisticsServiceImpl extends MPJBaseServiceImpl<Attendan
         for (ArrayList<String> rowData : dataList) {
             Row dataRow = sheet.createRow(dataRowNumber);
             for (int i = 0; i < rowData.size(); i ++){
-                sheet.autoSizeColumn(i);
+                if(i > 7){
+                    sheet.autoSizeColumn(i);
+                }
                 String content = rowData.get(i);
                 Font font = workbook.createFont();
                 font.setBold(false);// 设置为粗体
@@ -515,6 +518,9 @@ public class AttendanceStatisticsServiceImpl extends MPJBaseServiceImpl<Attendan
                 CellStyle cellStyle = workbook.createCellStyle();
                 cellStyle.setFont(font); // 将字体应用到样式
                 cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+                if(i > 3 && i < 8){
+                    cellStyle.setAlignment(HorizontalAlignment.CENTER);
+                }
 
                 Cell row1cell2 = dataRow.createCell(i);
                 row1cell2.setCellValue(content);
@@ -610,6 +616,7 @@ public class AttendanceStatisticsServiceImpl extends MPJBaseServiceImpl<Attendan
         row1cell1.setCellStyle(cellStyle);
         sheet.addMergedRegion(new CellRangeAddress(rowNumber, rowNumber + 1, 0, 0));
 
+
         Cell row1cell2 = row1.createCell(1);
         row1cell2.setCellValue("姓名");
         row1cell2.setCellStyle(cellStyle);
@@ -645,6 +652,12 @@ public class AttendanceStatisticsServiceImpl extends MPJBaseServiceImpl<Attendan
         row1cell7.setCellStyle(cellStyle);
         sheet.addMergedRegion(new CellRangeAddress(rowNumber, rowNumber + 1, 7, 7));
 
+        for(int i = 0; i < 7; i ++){
+            sheet.autoSizeColumn(i);
+        }
+        sheet.setColumnWidth(4, 24 * 256);
+        sheet.setColumnWidth(5, 24 * 256);
+
         int cellNumber = 8;
         for (String dayOfWeek : weekList) {
             Cell row1cell = row1.createCell(cellNumber);

src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeStatisticsController.java

@@ -1,12 +1,14 @@
 package com.xjrsoft.module.classtime.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.DeleteMark;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.RT;
@@ -76,6 +78,7 @@ public class ClassTimeStatisticsController {
                 .orderByDesc(ClassTimeStatistics::getId)
                 .eq(dto.getYear() != null, ClassTimeStatistics::getYear, dto.getYear())
                 .eq(dto.getMonth() != null, ClassTimeStatistics::getMonth, dto.getMonth())
+                .eq(ClassTimeStatistics::getCategory, 1)
                 .select(ClassTimeStatistics.class,x -> VoToColumnUtil.fieldsToColumns(ClassTimeStatisticsPageVo.class).contains(x.getProperty()));
         IPage<ClassTimeStatistics> page = classTimeStatisticsService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<ClassTimeStatisticsPageVo> pageOutput = ConventPage.getPageOutput(page, ClassTimeStatisticsPageVo.class);
@@ -152,7 +155,7 @@ public class ClassTimeStatisticsController {
     @SaCheckPermission("classtimestatisticsset:detail")
     public RT<LocalDate> lastInfo(){
         List<ClassTimeStatistics> list = classTimeStatisticsService.list(
-                new QueryWrapper<ClassTimeStatistics>().lambda().orderByDesc(ClassTimeStatistics::getEndDate)
+                new QueryWrapper<ClassTimeStatistics>().lambda().eq(ClassTimeStatistics::getCategory, 1).orderByDesc(ClassTimeStatistics::getEndDate)
         );
         if (list.isEmpty()) {
             return RT.ok();
@@ -240,4 +243,32 @@ public class ClassTimeStatisticsController {
         return RT.fileStream(bytes, fileName);
     }
 
+
+    @GetMapping(value = "/teacher-record-page")
+    @ApiOperation(value="课时统计教师详情列表")
+    @SaCheckPermission("classtimestatistics:detail")
+    public RT<PageOutput<ClassTimeStatisticsPageVo>> teacherRecordPage(@Valid ClassTimeStatisticsPageDto dto){
+
+        MPJLambdaWrapper<ClassTimeStatistics> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .select(ClassTimeStatisticsRecord::getId)
+                .selectAs(ClassTimeStatisticsRecord::getAllClassTime, ClassTimeStatistics::getAllClassTime)
+                .select(ClassTimeStatistics::getYear)
+                .select(ClassTimeStatistics::getMonth)
+                .select(ClassTimeStatistics::getStartDate)
+                .select(ClassTimeStatistics::getEndDate)
+                .select(ClassTimeStatistics::getModifyDate)
+                .select(ClassTimeStatistics::getStatus)
+                .innerJoin(ClassTimeStatisticsRecord.class, ClassTimeStatisticsRecord::getClassTimeStatisticsId, ClassTimeStatistics::getId)
+                .eq(dto.getYear() != null, ClassTimeStatistics::getYear, dto.getYear())
+                .eq(dto.getMonth() != null, ClassTimeStatistics::getMonth, dto.getMonth())
+                .eq(ClassTimeStatistics::getCategory, 1)
+                .eq(ClassTimeStatisticsRecord::getUserId, StpUtil.getLoginIdAsLong())
+                .orderByDesc(ClassTimeStatistics::getId)
+        ;
+        IPage<ClassTimeStatistics> page = classTimeStatisticsService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<ClassTimeStatisticsPageVo> pageOutput = ConventPage.getPageOutput(page, ClassTimeStatisticsPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
 }

src/main/java/com/xjrsoft/module/classtime/controller/CourseClassTimeStatisticsController.java

@@ -0,0 +1,224 @@
+package com.xjrsoft.module.classtime.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.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.exception.MyException;
+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.activity.dto.ChangeStatusDto;
+import com.xjrsoft.module.classtime.dto.AddClassTimeStatisticsDto;
+import com.xjrsoft.module.classtime.dto.ClassTimeStatisticsPageDto;
+import com.xjrsoft.module.classtime.dto.CourseRecordDto;
+import com.xjrsoft.module.classtime.dto.RefreshStatisticsDto;
+import com.xjrsoft.module.classtime.dto.UpdateClassTimeStatisticsDto;
+import com.xjrsoft.module.classtime.dto.UpdateOverworkloadNumberDto;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatistics;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsSet;
+import com.xjrsoft.module.classtime.service.IClassTimeStatisticsService;
+import com.xjrsoft.module.classtime.service.IClassTimeStatisticsSetService;
+import com.xjrsoft.module.classtime.vo.ClassTimeStatisticsPageVo;
+import com.xjrsoft.module.classtime.vo.ClassTimeStatisticsVo;
+import com.xjrsoft.module.classtime.vo.CourseClassTimeStatisticsRecordVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+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 java.io.IOException;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+
+/**
+* @title: 课时统计
+* @Author dzx
+* @Date: 2024年11月19日
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/courseClasstime" + "/classTimeStatistics")
+@Api(value = "/courseClasstime"  + "/classTimeStatistics",tags = "课表课时统计代码")
+@AllArgsConstructor
+public class CourseClassTimeStatisticsController {
+
+    private final IClassTimeStatisticsSetService statisticsSetService;
+    private final IClassTimeStatisticsService classTimeStatisticsService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="课时统计列表(分页)")
+    @SaCheckPermission("classtimestatistics:detail")
+    public RT<PageOutput<ClassTimeStatisticsPageVo>> page(@Valid ClassTimeStatisticsPageDto dto){
+
+        LambdaQueryWrapper<ClassTimeStatistics> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(ClassTimeStatistics::getId)
+                .eq(dto.getYear() != null, ClassTimeStatistics::getYear, dto.getYear())
+                .eq(dto.getMonth() != null, ClassTimeStatistics::getMonth, dto.getMonth())
+                .eq(ClassTimeStatistics::getCategory, 2)
+                .select(ClassTimeStatistics.class,x -> VoToColumnUtil.fieldsToColumns(ClassTimeStatisticsPageVo.class).contains(x.getProperty()));
+        IPage<ClassTimeStatistics> page = classTimeStatisticsService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<ClassTimeStatisticsPageVo> pageOutput = ConventPage.getPageOutput(page, ClassTimeStatisticsPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询课时统计信息")
+    @SaCheckPermission("classtimestatistics:detail")
+    public RT<ClassTimeStatisticsVo> info(@RequestParam Long id){
+        ClassTimeStatistics classTimeStatistics = classTimeStatisticsService.getByIdDeep(id);
+        if (classTimeStatistics == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(classTimeStatistics, ClassTimeStatisticsVo.class));
+    }
+
+    @PostMapping
+    @ApiOperation(value = "新增课时统计")
+    @SaCheckPermission("classtimestatistics:add")
+    public RT<Boolean> add(@Valid @RequestBody AddClassTimeStatisticsDto dto){
+        boolean isSuccess = classTimeStatisticsService.addCourse(dto);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改课时统计")
+    @SaCheckPermission("classtimestatistics:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateClassTimeStatisticsDto dto){
+        ClassTimeStatistics classTimeStatistics = BeanUtil.toBean(dto, ClassTimeStatistics.class);
+        return RT.ok(classTimeStatisticsService.updateCourse(classTimeStatistics));
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除课时统计")
+    @SaCheckPermission("classtimestatistics:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(classTimeStatisticsService.delete(ids));
+
+    }
+
+    @PostMapping(value = "/change-status")
+    @ApiOperation(value="修改状态")
+    @SaCheckPermission("classtimestatistics:detail")
+    public RT<Boolean> changeStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
+        ClassTimeStatistics statistics = classTimeStatisticsService.getById(dto.getId());
+        if(statistics == null){
+            throw new MyException("未能查到数据");
+        }
+        statistics.setStatus(dto.getStatus());
+        classTimeStatisticsService.updateById(statistics);
+        if(dto.getStatus() != null && dto.getStatus() == 3){
+            classTimeStatisticsService.lockData(dto.getId());
+        }
+        return RT.ok(true);
+    }
+
+    @PostMapping(value = "/over-workload-number-status")
+    @ApiOperation(value="修改超工作量基数状态")
+    @SaCheckPermission("classtimestatistics:detail")
+    public RT<Boolean> changeOverWorkloadNumberStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
+        ClassTimeStatistics statistics = classTimeStatisticsService.getById(dto.getId());
+        if(statistics == null){
+            throw new MyException("未能查到数据");
+        }
+        statistics.setOverWorkloadNumberStatus(dto.getStatus());
+        classTimeStatisticsService.updateById(statistics);
+        return RT.ok(true);
+    }
+
+    @PostMapping(value = "/over-workload-number")
+    @ApiOperation(value="修改超工作量基数")
+    @SaCheckPermission("classtimestatistics:detail")
+    public RT<Boolean> updateOverWorkloadNumber(@Valid @RequestBody UpdateOverworkloadNumberDto dto){
+        ClassTimeStatistics statistics = classTimeStatisticsService.getById(dto.getId());
+        statistics.setOverWorkloadNumber(dto.getOverWorkloadNumber());
+        classTimeStatisticsService.updateById(statistics);
+        return RT.ok(true);
+    }
+
+
+    @GetMapping(value = "/last-date")
+    @ApiOperation(value="查询最新统计的结束日期")
+    @SaCheckPermission("classtimestatisticsset:detail")
+    public RT<LocalDate> lastInfo(){
+        List<ClassTimeStatistics> list = classTimeStatisticsService.list(
+                new QueryWrapper<ClassTimeStatistics>().lambda().eq(ClassTimeStatistics::getCategory, 2).orderByDesc(ClassTimeStatistics::getEndDate)
+        );
+        if (list.isEmpty()) {
+            return RT.ok();
+        }
+        ClassTimeStatistics result = list.get(0);
+        return RT.ok(result.getEndDate());
+    }
+
+    @PostMapping("/refresh-statistics")
+    @ApiOperation(value = "刷新课表课时统计")
+    @SaCheckPermission("classtimestatistics:detail")
+    public RT<Boolean> refreshStatistics(@Valid @RequestBody RefreshStatisticsDto dto){
+
+        ClassTimeStatistics classTimeStatistics = classTimeStatisticsService.getById(dto.getId());
+        classTimeStatistics.setStatus(0);
+        classTimeStatistics.setModifyDate(new Date());
+
+        //查询最新权重并保存到统计中
+        Integer category = 3;
+        List<ClassTimeStatisticsSet> list = statisticsSetService.list(
+                new QueryWrapper<ClassTimeStatisticsSet>().lambda()
+                        .eq(ClassTimeStatisticsSet::getCategory, category)
+                        .orderByDesc(ClassTimeStatisticsSet::getCreateDate)
+        );
+        if(list.isEmpty()){
+            throw new MyException("请先设置权重并进行保存");
+        }
+        classTimeStatistics.setWeightSetJson(list.get(0).getJsonContent());
+
+        classTimeStatistics.setCostSetJson(list.get(0).getJsonContent());
+        Boolean aBoolean = classTimeStatisticsService.updateById(classTimeStatistics);
+
+        classTimeStatisticsService.refreshCourseRecord(classTimeStatistics);
+
+        return RT.ok(aBoolean);
+    }
+
+
+    @GetMapping(value = "/record-list")
+    @ApiOperation(value="课程课时统计详情列表")
+    @SaCheckPermission("classtimestatistics:detail")
+    public RT<List<CourseClassTimeStatisticsRecordVo>> recordPage(@Valid CourseRecordDto dto){
+        List<CourseClassTimeStatisticsRecordVo> recordList = classTimeStatisticsService.getCourseRecordList(dto);
+        return RT.ok(recordList);
+    }
+
+
+    @PostMapping("/import")
+    @ApiOperation(value = "导入")
+    @SaCheckPermission("classtimestatistics:detail")
+    public RT<Boolean> importData(@RequestParam Long classTimeStatisticsId, @RequestParam MultipartFile file) throws IOException {
+        Boolean aBoolean = classTimeStatisticsService.importAdministration(classTimeStatisticsId, file);
+        return RT.ok(aBoolean);
+    }
+
+    @PostMapping("/export-query")
+    @ApiOperation(value = "导出")
+    @SaCheckPermission("classtimestatistics:detail")
+    public ResponseEntity<byte[]> exportData(@Valid @RequestBody RefreshStatisticsDto dto) throws IOException {
+        byte[] bytes = classTimeStatisticsService.exportAdministration(dto.getId());
+        return RT.fileStream(bytes, "classtimestatistics" + ExcelTypeEnum.XLSX.getValue());
+    }
+
+}

src/main/java/com/xjrsoft/module/classtime/dto/AddClassTimeStatisticsSetDto.java

@@ -26,7 +26,7 @@ public class AddClassTimeStatisticsSetDto implements Serializable {
     /**
     * 类别(1:权重 2:费用设置)
     */
-    @ApiModelProperty("类别(1:权重 2:费用设置)")
+    @ApiModelProperty("类别(1:权重 2:费用设置 3:课时量权重)")
     private Integer category;
 
 }

src/main/java/com/xjrsoft/module/classtime/dto/CourseRecordDto.java

@@ -0,0 +1,28 @@
+package com.xjrsoft.module.classtime.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+* @title: 刷新课时
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class CourseRecordDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("id")
+    private Long id;
+
+    @ApiModelProperty(value = "排序字段")
+    private String field;
+
+    @ApiModelProperty(value = "排序方式 asc  desc")
+    private String order;
+}

src/main/java/com/xjrsoft/module/classtime/dto/UpdateOverworkloadNumberDto.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.classtime.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+* @title: 刷新课时
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class UpdateOverworkloadNumberDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("id")
+    private Long id;
+
+    @ApiModelProperty("超工作量基数")
+    private Double overWorkloadNumber;
+}

src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeStatistics.java

@@ -127,5 +127,15 @@ public class ClassTimeStatistics implements Serializable {
     @ApiModelProperty("权重json")
     private String costSetJson;
 
+    @ApiModelProperty("课时统计类型(1:全课时 2:课表课时)")
+    private Integer category;
 
+    @ApiModelProperty("总周次")
+    private Integer weeks;
+
+    @ApiModelProperty("超工作量基数状态(1:锁定 0:解锁)")
+    private Integer overWorkloadNumberStatus;
+
+    @ApiModelProperty("超工作量基数")
+    private Double overWorkloadNumber;
 }

src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeStatisticsAdministration.java

@@ -0,0 +1,87 @@
+package com.xjrsoft.module.classtime.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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 课时量统计-行政工作量
+* @Author dzx
+* @Date: 2024年11月20日
+* @Version 1.0
+*/
+@Data
+@TableName("class_time_statistics_administration")
+@ApiModel(value = "class_time_statistics_administration", description = "课时量统计-行政工作量")
+public class ClassTimeStatisticsAdministration implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 课时统计(class_time_statistics)
+    */
+    @ApiModelProperty("课时统计(class_time_statistics)")
+    private Long classTimeStatisticsId;
+    /**
+    * 教师id(xjr_user)
+    */
+    @ApiModelProperty("教师id(xjr_user)")
+    private Long userId;
+    /**
+    * 工作量
+    */
+    @ApiModelProperty("工作量")
+    private Double workload;
+}

src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeStatisticsRecord.java

@@ -112,32 +112,32 @@ public class ClassTimeStatisticsRecord implements Serializable {
     /**
     * 教研会
     */
-    @ApiModelProperty("教研会")
-    private Double classTime1;
+    @ApiModelProperty("总周次")
+    private Integer classTime1;
     /**
     * 督导听课
     */
-    @ApiModelProperty("督导听课")
+    @ApiModelProperty("周平均课时")
     private Double classTime2;
     /**
     * 临近三年退休政策
     */
-    @ApiModelProperty("临近三年退休政策")
+    @ApiModelProperty("行政工作量")
     private Double classTime3;
     /**
     * 出题
     */
-    @ApiModelProperty("出题")
+    @ApiModelProperty("总平均课时")
     private Double classTime4;
     /**
     * 阅卷
     */
-    @ApiModelProperty("阅卷")
+    @ApiModelProperty("工作量得分")
     private Double classTime5;
     /**
     * 周末培优
     */
-    @ApiModelProperty("周末培优")
+    @ApiModelProperty("超工作量得分")
     private Double classTime6;
     /**
     * 早自习

src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeStatisticsSet.java

@@ -77,7 +77,7 @@ public class ClassTimeStatisticsSet implements Serializable {
     /**
     * 类别(1:权重 2:费用设置)
     */
-    @ApiModelProperty("类别(1:权重 2:费用设置)")
+    @ApiModelProperty("类别(1:权重 2:费用设置 3:课时量权重)")
     private Integer category;
 
 

src/main/java/com/xjrsoft/module/classtime/mapper/ClassTimeStatisticsAdministrationMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.classtime.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsAdministration;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @title: 课时量统计-行政工作量
+ * @Author dzx
+ * @Date: 2024年11月20日
+ * @Version 1.0
+ */
+@Mapper
+public interface ClassTimeStatisticsAdministrationMapper extends MPJBaseMapper<ClassTimeStatisticsAdministration> {
+
+}

src/main/java/com/xjrsoft/module/classtime/mapper/ClassTimeStatisticsMapper.java

@@ -2,8 +2,10 @@ package com.xjrsoft.module.classtime.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.classtime.dto.CourseRecordDto;
 import com.xjrsoft.module.classtime.entity.ClassTimeStatistics;
 import com.xjrsoft.module.classtime.vo.ClassTimeStatisticsRecordVo;
+import com.xjrsoft.module.classtime.vo.CourseClassTimeStatisticsRecordVo;
 import com.xjrsoft.module.classtime.vo.CourseListVo;
 import com.xjrsoft.module.classtime.vo.TeacherListVo;
 import com.xjrsoft.module.oa.entity.WfTeacherCourseTime;
@@ -50,4 +52,6 @@ public interface ClassTimeStatisticsMapper extends MPJBaseMapper<ClassTimeStatis
      * @return
      */
     List<CourseListVo> getHolidayReplaceCourseList(@Param("dto") ClassTimeStatistics dto);
+
+    List<CourseClassTimeStatisticsRecordVo> getCourseRecordList(@Param("dto") CourseRecordDto dto);
 }

src/main/java/com/xjrsoft/module/classtime/service/IClassTimeStatisticsService.java

@@ -2,9 +2,12 @@ package com.xjrsoft.module.classtime.service;
 
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.classtime.dto.AddClassTimeStatisticsDto;
+import com.xjrsoft.module.classtime.dto.CourseRecordDto;
 import com.xjrsoft.module.classtime.entity.ClassTimeStatistics;
 import com.xjrsoft.module.classtime.vo.ClassTimeStatisticsRecordVo;
+import com.xjrsoft.module.classtime.vo.CourseClassTimeStatisticsRecordVo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.List;
@@ -25,6 +28,12 @@ public interface IClassTimeStatisticsService extends MPJBaseService<ClassTimeSta
     */
     Boolean add(ClassTimeStatistics classTimeStatistics);
 
+
+    /**
+     * 新增，只统计课表课时
+     */
+    Boolean addCourse(AddClassTimeStatisticsDto dto);
+
     /**
     * 更新
     *
@@ -33,6 +42,9 @@ public interface IClassTimeStatisticsService extends MPJBaseService<ClassTimeSta
     */
     Boolean update(ClassTimeStatistics classTimeStatistics);
 
+
+    Boolean updateCourse(ClassTimeStatistics classTimeStatistics);
+
     /**
     * 删除
     *
@@ -59,10 +71,19 @@ public interface IClassTimeStatisticsService extends MPJBaseService<ClassTimeSta
 
     List<ClassTimeStatisticsRecordVo> getRecordList(@Param("id") Long id);
 
+    List<CourseClassTimeStatisticsRecordVo> getCourseRecordList(@Param("dto") CourseRecordDto dto);
+
     /**
      * 导出明细
      * @param id
      * @return
      */
     byte[] recordExport(Long id) throws IOException;
+
+
+    Boolean refreshCourseRecord(ClassTimeStatistics statistics);
+
+    Boolean importAdministration(Long classTimeStatisticsId, MultipartFile file) throws IOException;
+
+    byte[] exportAdministration(Long classTimeStatisticsId) throws IOException;
 }

src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsServiceImpl.java

@@ -2,9 +2,12 @@ package com.xjrsoft.module.classtime.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -13,25 +16,36 @@ import com.google.gson.JsonParser;
 import com.xjrsoft.common.enums.CourseAdjustTypeEnum;
 import com.xjrsoft.common.enums.CourseTimeTypeEnum;
 import com.xjrsoft.common.enums.DeleteMark;
+import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
+import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.classtime.dto.AddClassTimeStatisticsDto;
+import com.xjrsoft.module.classtime.dto.CourseRecordDto;
 import com.xjrsoft.module.classtime.entity.ClassTimeDelete;
 import com.xjrsoft.module.classtime.entity.ClassTimeStatistics;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsAdministration;
 import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsRecord;
 import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsSet;
+import com.xjrsoft.module.classtime.mapper.ClassTimeStatisticsAdministrationMapper;
 import com.xjrsoft.module.classtime.mapper.ClassTimeStatisticsMapper;
 import com.xjrsoft.module.classtime.mapper.ClassTimeStatisticsRecordMapper;
 import com.xjrsoft.module.classtime.service.IClassTimeDeleteService;
 import com.xjrsoft.module.classtime.service.IClassTimeStatisticsService;
 import com.xjrsoft.module.classtime.service.IClassTimeStatisticsSetService;
+import com.xjrsoft.module.classtime.vo.ClassTimeStatisticsAdministrationExcelVo;
 import com.xjrsoft.module.classtime.vo.ClassTimeStatisticsRecordVo;
+import com.xjrsoft.module.classtime.vo.CourseClassTimeStatisticsRecordVo;
 import com.xjrsoft.module.classtime.vo.CourseListVo;
 import com.xjrsoft.module.classtime.vo.TeacherListVo;
 import com.xjrsoft.module.classtime.vo.WeekTimeRangeVo;
 import com.xjrsoft.module.oa.entity.WfTeacherCourseTime;
+import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.service.IDictionarydetailService;
+import com.xjrsoft.module.teacher.entity.BaseTeacher;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import lombok.AllArgsConstructor;
 import me.zhyd.oauth.log.Log;
 import org.apache.poi.ss.usermodel.Cell;
@@ -46,18 +60,20 @@ import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -83,6 +99,10 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
     private final IClassTimeDeleteService deleteService;
     private final IDictionarydetailService dictionaryService;
 
+    private final ClassTimeStatisticsAdministrationMapper administrationMapper;
+
+    private final IUserService userService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(ClassTimeStatistics classTimeStatistics) {
@@ -90,6 +110,36 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
         return true;
     }
 
+    @Override
+    public Boolean addCourse(AddClassTimeStatisticsDto dto) {
+        ClassTimeStatistics classTimeStatistics = BeanUtil.toBean(dto, ClassTimeStatistics.class);
+        classTimeStatistics.setStatus(0);
+        classTimeStatistics.setCategory(2);
+        classTimeStatistics.setCreateDate(new Date());
+
+        List<WeekTimeRangeVo> weekTimeRangeVos = calculateNaturalWeeks(classTimeStatistics.getStartDate(), classTimeStatistics.getEndDate());
+        classTimeStatistics.setWeeks(weekTimeRangeVos.size());
+        //查询最新权重并保存到统计中
+        Integer category = 3;
+        List<ClassTimeStatisticsSet> list = statisticsSetService.list(
+                new QueryWrapper<ClassTimeStatisticsSet>().lambda()
+                        .eq(ClassTimeStatisticsSet::getCategory, category)
+                        .orderByDesc(ClassTimeStatisticsSet::getCreateDate)
+        );
+        if(list.isEmpty()){
+            throw new MyException("请先设置权重并进行保存");
+        }
+        classTimeStatistics.setWeightSetJson(list.get(0).getJsonContent());
+
+        this.save(classTimeStatistics);
+
+        CompletableFuture.runAsync(() -> {
+            refreshCourseRecord(classTimeStatistics);
+        });
+
+        return true;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean update(ClassTimeStatistics classTimeStatistics) {
@@ -97,6 +147,14 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
         return true;
     }
 
+    @Override
+    public Boolean updateCourse(ClassTimeStatistics classTimeStatistics) {
+        List<WeekTimeRangeVo> weekTimeRangeVos = calculateNaturalWeeks(classTimeStatistics.getStartDate(), classTimeStatistics.getEndDate());
+        classTimeStatistics.setWeeks(weekTimeRangeVos.size());
+        statisticsMapper.updateById(classTimeStatistics);
+        return true;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean delete(List<Long> ids) {
@@ -111,6 +169,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
     public Boolean add(AddClassTimeStatisticsDto dto) {
         ClassTimeStatistics classTimeStatistics = BeanUtil.toBean(dto, ClassTimeStatistics.class);
         classTimeStatistics.setStatus(0);
+        classTimeStatistics.setCategory(1);
         classTimeStatistics.setCreateDate(new Date());
 
         //查询最新权重并保存到统计中
@@ -151,7 +210,6 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
      * 3、根绝统计的开始日期和结束日期查询课程表(course_table)中的所有课程数据
      * 4、查询补班日期下的所有课程
      * 5、属于节假日的课程不查询
-     * @param statistics
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -164,6 +222,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                     new QueryWrapper<DictionaryDetail>().lambda()
                             .eq(DictionaryDetail::getItemId, 1833772737004875778L)
                             .eq(DictionaryDetail::getDeleteMark, DeleteMark.NODELETE.getCode())
+                            .eq(DictionaryDetail::getEnabledMark, EnabledMark.ENABLED.getCode())
                             .orderByAsc(DictionaryDetail::getCode)
             );
             Map<String, String> CourseTimeTypeMap = CourseTimeTypeList.stream().collect(Collectors.toMap(DictionaryDetail::getCode, DictionaryDetail::getName));
@@ -199,6 +258,8 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
             List<ClassTimeDelete> deleteList = deleteService.list(
                     new QueryWrapper<ClassTimeDelete>().lambda()
                             .ne(ClassTimeDelete::getStatus, 2)
+                            .eq(ClassTimeDelete::getEnabledMark, EnabledMark.ENABLED.getCode())
+                            .eq(ClassTimeDelete::getDeleteMark, DeleteMark.NODELETE.getCode())
             );
             Map<Long, List<ClassTimeDelete>> deleteDataMap = deleteList.stream().collect(Collectors.groupingBy(ClassTimeDelete::getClassId));
             Map<Long, Map<LocalDate, String>> deleteMap = new HashMap<>();//将每个班级计算出来所有被删除的日期存入map
@@ -259,7 +320,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                 }
                 record.setCourseTimeTypeData(courseTimeTypeJson.toString());
 
-                //早自习、正课、晚辅、顶课、调课
+                //早自习、正课、晚辅
                 Double classTime7 = 0D,classTime8 = 0D,classTime9 = 0D,classTime11 = 0D;
 
                 List<String> zkList = Arrays.asList("上1","上2","上3","上4","下1","下2","下3","下4");
@@ -501,7 +562,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                 //计算总金额，课时费+超课时费
                 Double totalAmount = classTimeAmount + beyondClassTimeAmount + reduceTimeAmount.doubleValue();
                 record.setTotalAmount(totalAmount);
-                record.setAllClassTimeData(calculateClassTime(allClassTimeDataArray, weightSetMap, allDateList));
+                record.setAllClassTimeData(calculateClassTime(allClassTimeDataArray, weightSetMap, allDateList, new ArrayList<>(CourseTimeTypeMap.values())));
                 record.setCreateDate(new Date());
 
                 insertList.add(record);
@@ -519,13 +580,14 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
             statistics.setTotalAmount(insertList.stream().filter(x -> x.getTotalAmount() != null).mapToDouble(ClassTimeStatisticsRecord::getTotalAmount).sum());
             statistics.setBeyondClassTimeAmount(insertList.stream().filter(x -> x.getBeyondClassTimeAmount() != null).mapToDouble(ClassTimeStatisticsRecord::getBeyondClassTimeAmount).sum());
             statistics.setClassTimeAmount(insertList.stream().filter(x -> x.getClassTimeAmount() != null).mapToDouble(ClassTimeStatisticsRecord::getClassTimeAmount).sum());
-            statistics.setStatus(1);
-            this.updateById(statistics);
-            return true;
         }catch (Exception e){
             Log.error(e.getMessage(), e);
             throw new MyException("统计出错，请联系管理员");
+        }finally {
+            statistics.setStatus(1);
+            this.updateById(statistics);
         }
+        return true;
     }
 
     @Override
@@ -539,10 +601,13 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
         return this.baseMapper.getRecordList(id);
     }
 
+    @Override
+    public List<CourseClassTimeStatisticsRecordVo> getCourseRecordList(CourseRecordDto dto) {
+        return this.baseMapper.getCourseRecordList(dto);
+    }
+
     /**
      * 导出课时统计明细
-     * @param id
-     * @return
      */
     @Override
     public byte[] recordExport(Long id) {
@@ -698,6 +763,220 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
         }
     }
 
+    @Override
+    public Boolean refreshCourseRecord(ClassTimeStatistics statistics) {
+        try {
+            // 1、查询教师
+            List<TeacherListVo> teacherList = this.baseMapper.getTeacherList();
+
+            //查询课程数据，排除开节假日的数据
+            List<CourseListVo> allCourseList = this.baseMapper.getCourseList(statistics);
+            allCourseList.addAll(this.baseMapper.getHolidayReplaceCourseList(statistics));
+
+            //查询删除课时的数据，将每个班删除的具体日期统计出来
+            List<ClassTimeDelete> deleteList = deleteService.list(
+                    new QueryWrapper<ClassTimeDelete>().lambda()
+                            .ne(ClassTimeDelete::getStatus, 2)
+                            .eq(ClassTimeDelete::getDeleteMark, DeleteMark.NODELETE.getCode())
+                            .eq(ClassTimeDelete::getEnabledMark, EnabledMark.ENABLED.getCode())
+            );
+            Map<Long, List<ClassTimeDelete>> deleteDataMap = deleteList.stream().collect(Collectors.groupingBy(ClassTimeDelete::getClassId));
+            Map<Long, Map<LocalDate, String>> deleteMap = new HashMap<>();//将每个班级计算出来所有被删除的日期存入map
+            for (Long classId : deleteDataMap.keySet()) {
+                Map<LocalDate, String> dateMap = new HashMap<>();
+                for (ClassTimeDelete classTimeDelete : deleteDataMap.get(classId)) {
+                    LocalDate currentDate = classTimeDelete.getStartDate();
+                    while (!currentDate.isAfter(classTimeDelete.getEndDate())) {
+                        dateMap.put(currentDate, classTimeDelete.getTimePeriod());
+                        currentDate = currentDate.plusDays(1); // 增加一天
+                    }
+                }
+                //去重并存到map中
+                deleteMap.put(classId, dateMap);
+            }
+            JsonParser parser = new JsonParser();
+
+            //权重设置jsonArray
+            JsonArray weightSetArray = parser.parse(statistics.getWeightSetJson()).getAsJsonArray();
+            Map<String, Double> weightLabelMap = new LinkedHashMap<>();
+            Map<String, Double> weightFieldMap = new LinkedHashMap<>();
+            for (JsonElement jsonElement : weightSetArray) {
+                JsonObject object = jsonElement.getAsJsonObject();
+                weightLabelMap.put(object.get("label").getAsString(), object.get("value").getAsDouble());
+                weightFieldMap.put(object.get("field").getAsString(), object.get("value").getAsDouble());
+            }
+
+            //查询行政工作量并转成map
+            List<ClassTimeStatisticsAdministration> administrationList = administrationMapper.selectList(
+                    new QueryWrapper<ClassTimeStatisticsAdministration>().lambda()
+                            .eq(ClassTimeStatisticsAdministration::getClassTimeStatisticsId, statistics.getId())
+                            .eq(ClassTimeStatisticsAdministration::getDeleteMark, DeleteMark.NODELETE.getCode())
+                            .eq(ClassTimeStatisticsAdministration::getEnabledMark, EnabledMark.ENABLED.getCode())
+            );
+            Map<Long, Double> administrationMap = administrationList.stream().collect(Collectors.toMap(ClassTimeStatisticsAdministration::getUserId, ClassTimeStatisticsAdministration::getWorkload));
+
+
+            List<ClassTimeStatisticsRecord> insertList = new ArrayList<>();
+            for (TeacherListVo teacher : teacherList) {
+                ClassTimeStatisticsRecord record = new ClassTimeStatisticsRecord();
+                record.setUserId(teacher.getId());
+                record.setClassTimeStatisticsId(statistics.getId());
+                record.setEmployType(teacher.getEmployType());
+                record.setClassTime1(statistics.getWeeks());
+
+                //早自习、正课、晚辅、顶课、调课
+                Double classTime7 = 0D,classTime8 = 0D,classTime9 = 0D;
+
+                List<String> zkList = Arrays.asList("上1","上2","上3","上4","下1","下2","下3","下4");
+                List<String> wzxList = Arrays.asList("晚1","晚2","晚3");
+                //查询出老师的课程
+                List<CourseListVo> courseList = allCourseList.stream()
+                        .filter(x -> x.getTeacherId().contains(teacher.getId().toString()))
+                        .collect(Collectors.toList());
+
+                //循环，统计出各项数据
+                for (CourseListVo courseListVo : courseList) {
+                    Map<LocalDate, String> deleteDates = deleteMap.get(courseListVo.getClassId());
+                    if(deleteDates != null && deleteDates.containsKey(courseListVo.getScheduleDate()) && deleteDates.get(courseListVo.getScheduleDate()) != null
+                            && deleteDates.get(courseListVo.getScheduleDate()).contains(courseListVo.getTimeNumber()) ){
+                        continue;
+                    }
+
+                    if("早自习".equals(courseListVo.getShortName())){
+                        classTime8 += weightLabelMap.get(courseListVo.getShortName()) == null ? 0d : weightLabelMap.get(courseListVo.getShortName());
+                    }else if(zkList.contains(courseListVo.getShortName())){
+                        classTime8 += weightLabelMap.get(courseListVo.getShortName()) == null ? 0d : weightLabelMap.get(courseListVo.getShortName());
+                    }else if(wzxList.contains(courseListVo.getShortName())){
+                        classTime9 += weightLabelMap.get(courseListVo.getShortName()) == null ? 0d : weightLabelMap.get(courseListVo.getShortName());
+                    }
+                }
+                record.setClassTime7(classTime7);
+                record.setClassTime8(classTime8);
+                record.setClassTime9(classTime9);
+                //计算总课时：正课课时+晚辅
+                Double allTimes = classTime8 + classTime9;
+                record.setAllClassTime(allTimes);
+                //计算周平均课时：总课时÷总周次
+                double classTime2 = BigDecimal.valueOf(allTimes).divide(BigDecimal.valueOf(record.getClassTime1()),2, RoundingMode.HALF_UP).doubleValue();
+                record.setClassTime2(classTime2);
+                //行政工作量
+                record.setClassTime3(administrationMap.get(record.getUserId()));
+
+                //总平均课时
+                Double classTime4 = (record.getClassTime3()==null?0D:record.getClassTime3()) + (record.getClassTime2()==null?0D:record.getClassTime2());
+                record.setClassTime4(classTime4);
+
+                Double time13 = weightFieldMap.get("time13");
+                if(classTime4 > time13){
+                    record.setClassTime5(time13);
+                }else{
+                    record.setClassTime5(classTime4);
+                }
+
+                insertList.add(record);
+            }
+
+            if(!insertList.isEmpty()){
+                Double overWorkloadNumber = statistics.getOverWorkloadNumber() == null ? 0D : statistics.getOverWorkloadNumber();
+                Double time14 = weightFieldMap.get("time14");//工作量得分
+                Double time13 = weightFieldMap.get("time13");//超工作量得分
+                if(statistics.getOverWorkloadNumberStatus() != 1){
+                    //取出最大总平均课时
+                    Double maxClassTime4 = insertList.stream().mapToDouble(ClassTimeStatisticsRecord::getClassTime4).max().getAsDouble();
+                    //计算超工作量基数
+                    if(!maxClassTime4.equals(time13)){
+
+                        overWorkloadNumber = BigDecimal.valueOf(time14).divide((BigDecimal.valueOf(maxClassTime4).subtract(BigDecimal.valueOf(time13))),2, RoundingMode.HALF_UP).doubleValue();
+                    }
+                }
+                double allClassTime = insertList.stream().filter(x -> x.getAllClassTime() != null).mapToDouble(ClassTimeStatisticsRecord::getAllClassTime).sum();
+                statistics.setAllClassTime(allClassTime);
+                statistics.setOverWorkloadNumber(overWorkloadNumber);
+                //先删除
+                String sql = "delete from class_time_statistics_record where class_time_statistics_id = " + statistics.getId();
+                SqlRunnerAdapter.db().delete(sql);
+                for (ClassTimeStatisticsRecord record : insertList) {
+                    if(overWorkloadNumber != 0D && time13 < record.getClassTime4()){
+                        double classTime6 = BigDecimal.valueOf(record.getClassTime4())
+                                .subtract(BigDecimal.valueOf(time13))
+                                .multiply(BigDecimal.valueOf(overWorkloadNumber)).doubleValue();
+                        if(classTime6 > 0d){
+                            record.setClassTime6(classTime6);
+                        }
+                    }
+                    recordMapper.insert(record);
+                }
+            }
+        }catch (Exception e){
+            Log.error(e.getMessage(), e);
+            throw new MyException("刷新统计出错，请联系管理员");
+        }finally {
+            statistics.setStatus(1);
+            this.updateById(statistics);
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean importAdministration(Long classTimeStatisticsId, MultipartFile file){
+        try {
+            List<Map<Integer, Object>> excelDataList = EasyExcel.read(file.getInputStream()).sheet().headRowNumber(2).doReadSync();
+            List<User> teacherList = userService.list(
+                    new MPJLambdaWrapper<User>()
+                            .select(User::getId)
+                            .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
+                            .innerJoin(BaseTeacher.class, BaseTeacher::getUserId, User::getId)
+            );
+            List<ClassTimeStatisticsAdministration> insertList = new ArrayList<>();
+            Map<String, Long> userMap = teacherList.stream().collect(Collectors.toMap(User::getUserName, User::getId));
+            for (Map<Integer, Object> rowData : excelDataList) {
+                String userName = rowData.get(1).toString();
+                ClassTimeStatisticsAdministration data = new ClassTimeStatisticsAdministration(){{
+                    setClassTimeStatisticsId(classTimeStatisticsId);
+                    setUserId(userMap.get(userName));
+                    setWorkload(Double.parseDouble(rowData.get(3).toString()));
+                }};
+                insertList.add(data);
+            }
+            if(!insertList.isEmpty()){
+                String sql = "delete from class_time_statistics_administration where class_time_statistics_id = " + classTimeStatisticsId;
+                SqlRunnerAdapter.db().delete(sql);
+                for (ClassTimeStatisticsAdministration administration : insertList) {
+                    administrationMapper.insert(administration);
+                }
+
+                CompletableFuture.runAsync(() -> {
+                    ClassTimeStatistics statistics = this.getById(classTimeStatisticsId);
+                    refreshCourseRecord(statistics);
+                });
+            }
+            return true;
+        }catch (Exception e){
+            Log.error(e.getMessage(), e);
+            throw  new MyException("导入行政工作量报错，请联系管理员");
+        }
+    }
+
+    @Override
+    public byte[] exportAdministration(Long classTimeStatisticsId) {
+        CourseRecordDto dto = new CourseRecordDto() {{
+            setId(classTimeStatisticsId);
+        }};
+        List<CourseClassTimeStatisticsRecordVo> recordList = this.getCourseRecordList(dto);
+        List<ClassTimeStatisticsAdministrationExcelVo> list = new ArrayList<>();
+        int sortCode = 1;
+        for (CourseClassTimeStatisticsRecordVo el : recordList) {
+            ClassTimeStatisticsAdministrationExcelVo excelVo = BeanUtil.toBean(el, ClassTimeStatisticsAdministrationExcelVo.class);
+            excelVo.setSortCode(sortCode);
+            list.add(excelVo);
+            sortCode ++;
+        }
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, ClassTimeStatisticsAdministrationExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(list);
+
+        return bot.toByteArray();
+    }
+
     /**
      * 生成第二行表头
      * 前端固定表头：序号、工号、姓名、教研会、督导听课、临近三年退休政策、出题、阅卷、周末培优、早自习、正课(含调顶课时)、晚辅(含调顶课时)、顶课、调课
@@ -801,8 +1080,6 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
      * 生成第三行表头
      * 关于周的表头，周一日期到周二日期，第几周，最后拼接一个单独的月份
      *
-     * @param workbook
-     * @param sheet
      * @param month 月份
      * @param weekTimeRangeVos 周的数据，包含周一的日期周二的日期
      * @param lastIndex 前一个表头的单元格
@@ -849,8 +1126,6 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
      * 生成第四行表头
      * 表头内容：总课时(含调顶课节)、顶课(节)、调课(节)、晚辅(节)、课时晚辅合计
      *
-     * @param workbook
-     * @param sheet
      * @param weekTimeRangeVos 周的数据，包含周一的日期周二的日期
      * @param lastIndex 前一个表头的单元格
      */
@@ -947,7 +1222,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
         return dates;
     }
 
-    String calculateClassTime(JsonArray allClassTimeDataArray, Map<String, Double> weightSetMap, List<LocalDate> allDateList){
+    String calculateClassTime(JsonArray allClassTimeDataArray, Map<String, Double> weightSetMap, List<LocalDate> allDateList, List<String> CourseTimeTypeSet){
         JsonObject result = new JsonObject();
         //计算纵向的合计
         Double allClassTime = 0d;
@@ -1006,8 +1281,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
             columnTitleJson.addProperty("adjustType", "");
             columnTitle.add(columnTitleJson);
         }
-        String[] courseTimeTypes = CourseTimeTypeEnum.getValues();
-        for (String courseTimeType : courseTimeTypes) {
+        for (String courseTimeType : CourseTimeTypeSet) {
             double sum = 0d;
             JsonObject columnTitleJson = new JsonObject();
             for (JsonElement jsonElement : allClassTimeDataArray) {

src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsAdministrationExcelVo.java

@@ -0,0 +1,69 @@
+package com.xjrsoft.module.classtime.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 课时量统计-导出
+* @Author dzx
+* @Date: 2024年11月20日
+* @Version 1.0
+*/
+@Data
+public class ClassTimeStatisticsAdministrationExcelVo {
+
+
+    @ExcelProperty("序号")
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+
+    @ExcelProperty("工号")
+    @ApiModelProperty("工号")
+    private String userName;
+
+    @ExcelProperty("姓名")
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ExcelProperty("聘用类型")
+    @ApiModelProperty("聘用类型")
+    private String employTypeCn;
+
+    @ExcelProperty("正课课时")
+    @ApiModelProperty("正课课时")
+    private String classTime8;
+
+    @ExcelProperty("晚辅")
+    @ApiModelProperty("晚辅")
+    private String classTime9;
+
+    @ExcelProperty("总课时")
+    @ApiModelProperty("总课时")
+    private String allClassTime;
+
+    @ExcelProperty("总周次")
+    @ApiModelProperty("总周次")
+    private Integer classTime1;
+
+    @ExcelProperty("周平均课时")
+    @ApiModelProperty("周平均课时")
+    private String classTime2;
+
+    @ExcelProperty("行政工作量")
+    @ApiModelProperty("行政工作量")
+    private String classTime3;
+
+    @ExcelProperty("总平均课时")
+    @ApiModelProperty("总平均课时")
+    private String classTime4;
+
+    @ExcelProperty("工作量得分")
+    @ApiModelProperty("工作量得分")
+    private String classTime5;
+
+    @ExcelProperty("超工作量得分")
+    @ApiModelProperty("超工作量得分")
+    private String classTime6;
+
+}

src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsPageVo.java

@@ -95,4 +95,7 @@ public class ClassTimeStatisticsPageVo {
     @ApiModelProperty("状态(0:已解锁 1：已锁定)")
     private Integer status;
 
+    @ApiModelProperty("总周次")
+    private Integer weeks;
+
 }

src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsVo.java

@@ -75,4 +75,13 @@ public class ClassTimeStatisticsVo {
      */
     @ApiModelProperty("权重json")
     private String costSetJson;
+
+    @ApiModelProperty("总周次")
+    private Integer weeks;
+
+    @ApiModelProperty("超工作量基数状态(1:锁定 0:解锁)")
+    private Integer overWorkloadNumberStatus;
+
+    @ApiModelProperty("超工作量基数")
+    private Double overWorkloadNumber;
 }

src/main/java/com/xjrsoft/module/classtime/vo/CourseClassTimeStatisticsRecordVo.java

@@ -0,0 +1,68 @@
+package com.xjrsoft.module.classtime.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 课时统计-教师详情表单出参
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class CourseClassTimeStatisticsRecordVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 课时统计(class_time_statistics)
+    */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+    * 教师id(xjr_user)
+    */
+    @ApiModelProperty("工号")
+    private String userName;
+    /**
+    * 聘用类型
+    */
+    @ApiModelProperty("聘用类型")
+    private String employTypeCn;
+    /**
+    * 总课时
+    */
+    @ApiModelProperty("总课时")
+    private String allClassTime;
+
+    @ApiModelProperty("总周次")
+    private Integer classTime1;
+
+    @ApiModelProperty("周平均课时")
+    private String classTime2;
+
+    @ApiModelProperty("行政工作量")
+    private String classTime3;
+
+    @ApiModelProperty("总平均课时")
+    private String classTime4;
+
+    @ApiModelProperty("工作量得分")
+    private String classTime5;
+
+    @ApiModelProperty("超工作量得分")
+    private String classTime6;
+
+    @ApiModelProperty("早自习")
+    private String classTime7;
+
+    @ApiModelProperty("正课")
+    private String classTime8;
+
+    @ApiModelProperty("晚辅")
+    private String classTime9;
+
+}

src/main/java/com/xjrsoft/module/form/controller/FormExecuteController.java

@@ -47,10 +47,12 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
@@ -77,6 +79,8 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class FormExecuteController {
 
+    private static final SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
     private final IFormExecuteService formExecuteService;
     
     private final IFormReleaseService formReleaseService;
@@ -260,7 +264,7 @@ public class FormExecuteController {
         // 设置第每列的列宽度
         for (ImportConfig importConfig : importConfigs) {
             if(importConfig.getWidth() == 0){
-                sheet.setColumnWidth(importConfig.getSortCode(), importConfig.getLabel().length() * 4 * 256);
+                sheet.setColumnWidth(importConfig.getSortCode(), importConfig.getLabel().length() * 3 * 256);
 //                sheet.autoSizeColumn(importConfig.getSortCode());
             }else {
                 sheet.setColumnWidth(importConfig.getSortCode(), importConfig.getWidth() * 256);
@@ -314,6 +318,23 @@ public class FormExecuteController {
                         value = LocalDateTimeUtil.format(time);
                     }
 
+                    // 检查类层次结构
+                    if (value == null) {
+                        value = "";
+                    } else if (value instanceof Integer) {
+                        value = Integer.toString((Integer) value);
+                    } else if (value instanceof Double) {
+                        value = Double.toString((Double) value);
+                    } else if (value instanceof Long) {
+                        value = Long.toString((Long) value);
+                    } else if (value instanceof BigDecimal) {
+                        value = ((BigDecimal) value).toPlainString();
+                    } else if (value instanceof Date) {
+                        value = DATE_FORMATTER.format((Date) value);
+                    } else {
+                        value = value.toString(); // 默认处理其他类型的对象
+                    }
+
                     Cell cell = dataRow.createCell(i);
                     cell.setCellValue((String)value);
                     cell.setCellStyle(cellStyle);
@@ -463,16 +484,15 @@ public class FormExecuteController {
             }
         }
 
-
         FormRelease formRelease = formReleaseService.getById(releaseId);
         FormReleaseConfig formReleaseConfig = JSONUtil.toBean(formRelease.getConfigJson(), FormReleaseConfig.class);
         // 配置excel第一行字段名
         List<List<String>> head = new ArrayList<>();
 //        List<ColumnConfig> columnConfigs = formReleaseConfig.getListConfig().getColumnConfigs();
-        List<ImportConfig> importConfigs = formReleaseConfig.getListConfig().getImportConfigs();
 //        for (ColumnConfig config : columnConfigs) {
 //            head.add(Collections.singletonList(config.getLabel()));
 //        }
+        List<ImportConfig> importConfigs = formReleaseConfig.getListConfig().getImportConfigs();
         for (ImportConfig config : importConfigs) {
             head.add(Collections.singletonList(config.getLabel()));
         }

src/main/java/com/xjrsoft/module/form/dto/UpdateFormReleaseDto.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.form.dto;
 import com.xjrsoft.module.form.entity.MenuConfig;
 import com.xjrsoft.module.generator.entity.ListConfig;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -12,6 +13,7 @@ import javax.validation.constraints.NotNull;
  * @Date: 2022/5/11 11:23
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class UpdateFormReleaseDto {
 
     @NotNull(message = "发布id不能为空")

src/main/java/com/xjrsoft/module/form/service/impl/FormExecuteServiceImpl.java

@@ -503,18 +503,27 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
             // 根据表单配置获取字典数据
             Map<String, Map<String, Object>> formDicData = FormDataTransUtil.formConfigGetDicData(formDesignConfig);
 
+            int row = 1;
             for (Map<String, Object> data : dataList) {
                 Entity where = Entity.create(tableName);
                 // 处理字段值
-                Map<String, Object> toSaveFormData = handleFormDataForSave(data, formDesignConfig, tableName, new ArrayList<>(), formDicData);
-
-                //formData 默认插入雪花Id主键
-                pk.ifPresent(column -> toSaveFormData.put(column.getName(), IdUtil.getSnowflakeNextId()));
-                where.putAll(toSaveFormData);
-                //如果有审计字段  默认填充值
-                putAuditEntityInsertData(where, columns);
-
-                toSaveList.add(where);
+                try {
+                    Map<String, Object> toSaveFormData = handleFormDataForSave(data, formDesignConfig, tableName, new ArrayList<>(), formDicData);
+                    //formData 默认插入雪花Id主键
+                    pk.ifPresent(column -> toSaveFormData.put(column.getName(), IdUtil.getSnowflakeNextId()));
+                    where.putAll(toSaveFormData);
+                    //如果有审计字段  默认填充值
+                    putAuditEntityInsertData(where, columns);
+
+                    toSaveList.add(where);
+                }catch (MyException e){
+                    String msg = e.getMsg();
+                    if(msg.toLowerCase().contains("字典值不匹配-".toLowerCase())){
+                        String value = msg.substring(msg.indexOf('-') + 1);
+                        throw new MyException("第" + row + "行的" + value + "值不属于可使用的值！");
+                    }
+                }
+                row++;
             }
             try {
                 Boolean result = SqlRunnerAdapter.db().dynamicInsertBatch(tableName, toSaveList);
@@ -2366,6 +2375,9 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
                     List<Object> mapKey = FormDataTransUtil.getMapKey(dicData, formData.get(bindField));
                     if (!mapKey.isEmpty()) {
                         resultData.put(bindField, mapKey.stream().findFirst().get());
+                    }else{
+                        String label = config.getLabel();
+                        throw new MyException("字典值不匹配-" + label);
                     }
                 }
             }

src/main/java/com/xjrsoft/module/generator/entity/ImportConfig.java

@@ -1,25 +1,17 @@
 package com.xjrsoft.module.generator.entity;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotNull;
 
 @Data
 public class ImportConfig {
     /**
      * 字段
      */
-    @NotNull(message = "字段不能为空！")
-    @Length(max = 30, message = "字段长度不能超过30！")
     private String fieldName;
 
     /**
      * 字段名称
      */
-    @NotNull(message = "字段名称不能为空！")
-    @Length(max = 20, message = "字段名称不能超过20！")
     private String label;
 
     /**
@@ -30,9 +22,7 @@ public class ImportConfig {
     /**
      * 是否必填
      */
-    @ApiModelProperty("是否必填")
     private Boolean required;
 
-    @ApiModelProperty("排序码")
     private Integer sortCode;
 }

src/main/java/com/xjrsoft/module/oa/mapper/NewsMapper.java

@@ -29,6 +29,9 @@ public interface NewsMapper extends MPJBaseMapper<News> {
     List<DeptIdOrClassIdVo> getDeptIdOrClassId(@Param("personalIdList") List<Long> personalIdList);
 
 
-    @Update("UPDATE xjr_oa_news_relation SET read_mark = 1 WHERE user_id = #{userId}")
+    @Update("UPDATE xjr_oa_news_relation t1" +
+            " INNER JOIN xjr_oa_news t2 ON t1.news_id = t2.id" +
+            " SET t1.read_mark = 1,t1.read_date = NOW() WHERE t1.user_id = #{userId}" +
+            " AND t2.status = 2")
     void allRead(Long userId);
 }

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -479,7 +479,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
 
             //对人员进行筛选,避免重复添加
             List<Long> userIdList = new ArrayList<>();
-            if (personalIdList.size() > 0) {
+            if (!personalIdList.isEmpty()) {
                 //获取人员的班级或者部门
                 List<DeptIdOrClassIdVo> deptIdOrClassIdVoList = newsMapper.getDeptIdOrClassId(personalIdList);
                 for (DeptIdOrClassIdVo deptIdOrClassIdVo : deptIdOrClassIdVoList) {
@@ -495,17 +495,17 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                 }
             }
             //添加部门人员
-            if (deptIdList.size() > 0) {
+            if (!deptIdList.isEmpty()) {
                 newsRelationMapper.insertDeptUser(xjrNews.getId(), deptIdList);
             }
 
             //添加部门人员
-            if (classIdList.size() > 0) {
+            if (!classIdList.isEmpty()) {
                 newsRelationMapper.insertClassUser(xjrNews.getId(), classIdList);
             }
 
             //添加部门人员
-            if (userIdList.size() > 0) {
+            if (!userIdList.isEmpty()) {
                 newsRelationMapper.insertPersonl(xjrNews.getId(), userIdList);
             }
 

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -21,12 +21,10 @@ import com.xjrsoft.module.courseTable.entity.CourseTable;
 import com.xjrsoft.module.courseTable.service.IClassTimeService;
 import com.xjrsoft.module.courseTable.service.ICourseTableService;
 import com.xjrsoft.module.schedule.dto.ClassOptionDto;
-import com.xjrsoft.module.schedule.dto.CourseInfoDto;
 import com.xjrsoft.module.schedule.dto.CourseTableAdjustDto;
 import com.xjrsoft.module.schedule.dto.CourseTableDto;
 import com.xjrsoft.module.schedule.dto.CourseTablePreCheckDto;
 import com.xjrsoft.module.schedule.dto.ScheduleWeekDto;
-import com.xjrsoft.module.schedule.dto.ScheduleWeekExportQueryDto;
 import com.xjrsoft.module.schedule.dto.WfCourseAdjustDto;
 import com.xjrsoft.module.schedule.entity.CourseReceiveMsg;
 import com.xjrsoft.module.schedule.service.ICourseReceiveMsgService;

src/main/resources/mapper/classtime/ClassTimeDeleteMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.xjrsoft.module.classtime.mapper.ClassTimeDeleteMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.classtime.dto.ClassTimeDeletePageDto" resultType="com.xjrsoft.module.classtime.vo.ClassTimeDeletePageVo">
         SELECT t1.id, t2.name AS class_name,t3.name AS type_cn,t1.type,t4.name AS operation_user_name,t1.remark,t1.time_period,
-        t1.start_date,t1.end_date,t1.status,IFNULL(t1.modify_date,t1.create_date) AS operation_time FROM class_time_delete t1
+        t1.start_date,t1.end_date,t1.status,IFNULL(t1.modify_date,t1.create_date) AS operation_date FROM class_time_delete t1
         INNER JOIN base_class t2 ON t1.class_id = t2.id
         LEFT JOIN xjr_dictionary_detail t3 ON t1.type = t3.code
         LEFT JOIN xjr_user t4 ON IFNULL(t1.modify_user_id, t1.create_user_id) = t4.id

src/main/resources/mapper/classtime/ClassTimeStatisticsMapper.xml

@@ -18,7 +18,7 @@
     </select>
 
     <select id="getCourseList" parameterType="com.xjrsoft.module.classtime.entity.ClassTimeStatistics" resultType="com.xjrsoft.module.classtime.vo.CourseListVo">
-        SELECT t1.class_id, t1.teacher_id, t2.short_name,t1.adjust_type,t4.reason,t1.schedule_date,t1.class_name,t1.course_name,t1.time_number FROM course_table t1
+        SELECT DISTINCT t1.class_id, t1.teacher_id, t2.short_name,t1.adjust_type,t4.reason,t1.schedule_date,t1.class_name,t1.course_name,t1.time_number FROM course_table t1
         LEFT JOIN class_time t2 ON t1.time_period = t2.time_period AND t1.time_number = t2.number
         LEFT JOIN course_table_bak t3 ON t1.id = t3.id
         LEFT JOIN wf_course_adjust t4 ON t4.id = t3.wf_course_adjust_id
@@ -79,5 +79,26 @@
         LEFT JOIN xjr_dictionary_detail t3 ON t1.employ_type = t3.code
         WHERE t1.delete_mark = 0 AND t1.class_time_statistics_id = #{id}
     </select>
+    <select id="getCourseRecordList" parameterType="com.xjrsoft.module.classtime.dto.CourseRecordDto" resultType="com.xjrsoft.module.classtime.vo.CourseClassTimeStatisticsRecordVo">
+        SELECT t1.id,t2.user_name,t2.name,t3.name AS employ_type_cn,t1.week_data,
+        t1.class_time1,t1.class_time2,t1.class_time3,t1.class_time4,t1.class_time5,
+        t1.class_time6,t1.class_time7,t1.class_time8,t1.class_time9,t1.class_time10,t1.class_time11,course_time_type_data,
+        t1.all_class_time,t1.total_amount,t1.class_time_amount,t1.beyond_class_time_amount FROM class_time_statistics_record t1
+        INNER JOIN xjr_user t2 ON t1.user_id = t2.id
+        LEFT JOIN xjr_dictionary_detail t3 ON t1.employ_type = t3.code
+        WHERE t1.delete_mark = 0 AND t1.class_time_statistics_id = #{dto.id}
+        <if test="dto.order != null">
+            <if test="dto.order == 'ascend'">
+                <if test="dto.field != null and dto.field == 'classTime4'">
+                    order by t1.class_time4 asc
+                </if>
 
+            </if>
+            <if test="dto.order == 'descend'">
+                <if test="dto.field != null and dto.field == 'classTime4'">
+                    order by t1.class_time4 desc
+                </if>
+            </if>
+        </if>
+    </select>
 </mapper>