课表课时统计

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

@@ -20,7 +20,6 @@ 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.ClassTimeStatisticsRecordVo;
 import com.xjrsoft.module.classtime.vo.ClassTimeStatisticsVo;
 import com.xjrsoft.module.classtime.vo.CourseClassTimeStatisticsRecordVo;
 import io.swagger.annotations.Api;
@@ -96,7 +95,7 @@ public class CourseClassTimeStatisticsController {
     @SaCheckPermission("classtimestatistics:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateClassTimeStatisticsDto dto){
         ClassTimeStatistics classTimeStatistics = BeanUtil.toBean(dto, ClassTimeStatistics.class);
-        return RT.ok(classTimeStatisticsService.update(classTimeStatistics));
+        return RT.ok(classTimeStatisticsService.updateCourse(classTimeStatistics));
     }
 
     @DeleteMapping
@@ -123,6 +122,20 @@ public class CourseClassTimeStatisticsController {
         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);
+    }
+
+
     @GetMapping(value = "/last-date")
     @ApiOperation(value="查询最新统计的结束日期")
     @SaCheckPermission("classtimestatisticsset:detail")

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

@@ -129,4 +129,13 @@ public class ClassTimeStatistics implements Serializable {
 
     @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/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/service/IClassTimeStatisticsService.java

@@ -40,6 +40,9 @@ public interface IClassTimeStatisticsService extends MPJBaseService<ClassTimeSta
     */
     Boolean update(ClassTimeStatistics classTimeStatistics);
 
+
+    Boolean updateCourse(ClassTimeStatistics classTimeStatistics);
+
     /**
     * 删除
     *

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

@@ -13,13 +13,16 @@ 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.module.classtime.dto.AddClassTimeStatisticsDto;
 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;
@@ -50,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 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;
@@ -62,6 +66,7 @@ import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.OptionalDouble;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -84,6 +89,8 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
     private final IClassTimeDeleteService deleteService;
     private final IDictionarydetailService dictionaryService;
 
+    private final ClassTimeStatisticsAdministrationMapper administrationMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(ClassTimeStatistics classTimeStatistics) {
@@ -98,6 +105,8 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
         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(
@@ -126,6 +135,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) {
@@ -181,7 +198,6 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
      * 3、根绝统计的开始日期和结束日期查询课程表(course_table)中的所有课程数据
      * 4、查询补班日期下的所有课程
      * 5、属于节假日的课程不查询
-     * @param statistics
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -194,6 +210,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));
@@ -229,6 +246,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
@@ -289,7 +308,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");
@@ -549,13 +568,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
@@ -733,7 +753,136 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
 
     @Override
     public Boolean refreshCourseRecord(ClassTimeStatistics statistics) {
-        return null;
+        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 allClassTime = 0D;
+
+                //早自习、正课、晚辅、顶课、调课
+                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) {
+                    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.setClassTime8(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() + 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()){
+                if(statistics.getOverWorkloadNumberStatus() != 1){
+                    //取出最大总平均课时
+                    Double maxClassTime4 = insertList.stream().mapToDouble(ClassTimeStatisticsRecord::getClassTime4).max().getAsDouble();
+                    //计算超工作量基数
+                    Double time14 = weightFieldMap.get("time14");//工作量得分
+                    Double time13 = weightFieldMap.get("time13");//超工作量得分
+                }
+                //先删除
+                String sql = "delete from class_time_statistics_record where class_time_statistics_id = " + statistics.getId();
+                SqlRunnerAdapter.db().delete(sql);
+                for (ClassTimeStatisticsRecord record : insertList) {
+                    recordMapper.insert(record);
+                }
+            }
+        }catch (Exception e){
+            Log.error(e.getMessage(), e);
+            throw new MyException("刷新统计出错，请联系管理员");
+        }finally {
+            statistics.setStatus(1);
+            this.updateById(statistics);
+        }
+        return true;
     }
 
     /**

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

@@ -75,4 +75,7 @@ public class ClassTimeStatisticsVo {
      */
     @ApiModelProperty("权重json")
     private String costSetJson;
+
+    @ApiModelProperty("总周次")
+    private Integer weeks;
 }

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

@@ -81,12 +81,11 @@
     </select>
     <select id="getCourseRecordList" 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
+        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 = #{id}
     </select>
-
 </mapper>