课表课时统计

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

@@ -22,6 +22,7 @@ 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;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -167,10 +168,10 @@ public class CourseClassTimeStatisticsController {
 
 
     @GetMapping(value = "/record-list")
-    @ApiOperation(value="课时统计详情列表")
+    @ApiOperation(value="课程课时统计详情列表")
     @SaCheckPermission("classtimestatistics:detail")
-    public RT<List<ClassTimeStatisticsRecordVo>> recordPage(@Valid RefreshStatisticsDto dto){
-        List<ClassTimeStatisticsRecordVo> recordList = classTimeStatisticsService.getRecordList(dto.getId());
+    public RT<List<CourseClassTimeStatisticsRecordVo>> recordPage(@Valid RefreshStatisticsDto dto){
+        List<CourseClassTimeStatisticsRecordVo> recordList = classTimeStatisticsService.getCourseRecordList(dto.getId());
         return RT.ok(recordList);
     }
 

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/mapper/ClassTimeStatisticsMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 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 +51,6 @@ public interface ClassTimeStatisticsMapper extends MPJBaseMapper<ClassTimeStatis
      * @return
      */
     List<CourseListVo> getHolidayReplaceCourseList(@Param("dto") ClassTimeStatistics dto);
+
+    List<CourseClassTimeStatisticsRecordVo> getCourseRecordList(@Param("id") Long id);
 }

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

@@ -4,6 +4,7 @@ import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.classtime.dto.AddClassTimeStatisticsDto;
 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 java.io.IOException;
@@ -65,6 +66,8 @@ public interface IClassTimeStatisticsService extends MPJBaseService<ClassTimeSta
 
     List<ClassTimeStatisticsRecordVo> getRecordList(@Param("id") Long id);
 
+    List<CourseClassTimeStatisticsRecordVo> getCourseRecordList(@Param("id") Long id);
+
     /**
      * 导出明细
      * @param id

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

@@ -26,6 +26,7 @@ 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.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;
@@ -568,6 +569,11 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
         return this.baseMapper.getRecordList(id);
     }
 
+    @Override
+    public List<CourseClassTimeStatisticsRecordVo> getCourseRecordList(Long id) {
+        return this.baseMapper.getCourseRecordList(id);
+    }
+
     /**
      * 导出课时统计明细
      */

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/resources/mapper/classtime/ClassTimeStatisticsMapper.xml

@@ -79,5 +79,14 @@
         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" 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 = #{id}
+    </select>
 
 </mapper>