课时统计记录详情返回参数调整

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

@@ -3,9 +3,14 @@ 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.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.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
@@ -25,6 +30,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.RecordDetailVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -197,9 +203,10 @@ public class ClassTimeStatisticsController {
     @GetMapping(value = "/record-detail-info")
     @ApiOperation(value="课时统计详情明细")
     @SaCheckPermission("classtimestatistics:detail")
-    public RT<String> recordDetailInfo(@Valid RefreshStatisticsDto dto){
+    public RT<RecordDetailVo> recordDetailInfo(@Valid RefreshStatisticsDto dto){
         ClassTimeStatisticsRecord record = recordService.getById(dto.getId());
-        return RT.ok(record.getAllClassTimeData());
+        RecordDetailVo recordDetailVo = JSON.parseObject(record.getAllClassTimeData(), RecordDetailVo.class);
+        return RT.ok(recordDetailVo);
     }
 
     @PostMapping(value = "/record-detail-export-query")

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

@@ -0,0 +1,34 @@
+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 RecordDetailListVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("日期")
+    private String scheduleDate;
+    /**
+    * 补班日期
+    */
+    @ApiModelProperty("内容")
+    private String content;
+    /**
+    * 补课日期
+    */
+    @ApiModelProperty("分类")
+    private String type;
+
+    @ApiModelProperty("调整类型")
+    private String adjustType;
+
+}

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

@@ -0,0 +1,37 @@
+package com.xjrsoft.module.classtime.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+* @title: 节假日调课设置表单出参
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class RecordDetailVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("行")
+    private List<RecordDetailListVo> rowTitle;
+    /**
+    * 补班日期
+    */
+    @ApiModelProperty("列")
+    private List<RecordDetailListVo> columnTitle;
+    /**
+    * 补课日期
+    */
+    @ApiModelProperty("数据")
+    private List<RecordDetailListVo> data;
+
+    @ApiModelProperty("总课时")
+    private Integer allClassTime;
+
+}