Selaa lähdekoodia

课时统计初始版本

dzx 1 vuosi sitten
vanhempi
commit
124dc94427
26 muutettua tiedostoa jossa 1546 lisäystä ja 1 poistoa
  1. 118 0
      src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeStatisticsController.java
  2. 117 0
      src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeStatisticsSetController.java
  3. 43 0
      src/main/java/com/xjrsoft/module/classtime/dto/AddClassTimeStatisticsDto.java
  4. 128 0
      src/main/java/com/xjrsoft/module/classtime/dto/AddClassTimeStatisticsRecordDto.java
  5. 32 0
      src/main/java/com/xjrsoft/module/classtime/dto/AddClassTimeStatisticsSetDto.java
  6. 25 0
      src/main/java/com/xjrsoft/module/classtime/dto/ClassTimeStatisticsPageDto.java
  7. 19 0
      src/main/java/com/xjrsoft/module/classtime/dto/ClassTimeStatisticsSetPageDto.java
  8. 24 0
      src/main/java/com/xjrsoft/module/classtime/dto/UpdateClassTimeStatisticsDto.java
  9. 24 0
      src/main/java/com/xjrsoft/module/classtime/dto/UpdateClassTimeStatisticsSetDto.java
  10. 119 0
      src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeStatistics.java
  11. 179 0
      src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeStatisticsRecord.java
  12. 84 0
      src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeStatisticsSet.java
  13. 16 0
      src/main/java/com/xjrsoft/module/classtime/mapper/ClassTimeStatisticsMapper.java
  14. 16 0
      src/main/java/com/xjrsoft/module/classtime/mapper/ClassTimeStatisticsRecordMapper.java
  15. 16 0
      src/main/java/com/xjrsoft/module/classtime/mapper/ClassTimeStatisticsSetMapper.java
  16. 39 0
      src/main/java/com/xjrsoft/module/classtime/service/IClassTimeStatisticsService.java
  17. 14 0
      src/main/java/com/xjrsoft/module/classtime/service/IClassTimeStatisticsSetService.java
  18. 52 0
      src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsServiceImpl.java
  19. 19 0
      src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsSetServiceImpl.java
  20. 98 0
      src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsPageVo.java
  21. 130 0
      src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsRecordVo.java
  22. 63 0
      src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsSetPageVo.java
  23. 33 0
      src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsSetVo.java
  24. 76 0
      src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsVo.java
  25. 1 1
      src/main/java/com/xjrsoft/module/ledger/controller/LedgerCustomController.java
  26. 61 0
      src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

+ 118 - 0
src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeStatisticsController.java

@@ -0,0 +1,118 @@
+package com.xjrsoft.module.classtime.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.UpdateClassTimeStatisticsDto;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatistics;
+import com.xjrsoft.module.classtime.service.IClassTimeStatisticsService;
+import com.xjrsoft.module.classtime.vo.ClassTimeStatisticsPageVo;
+import com.xjrsoft.module.classtime.vo.ClassTimeStatisticsVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 课时统计
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/classtime" + "/classTimeStatistics")
+@Api(value = "/classtime"  + "/classTimeStatistics",tags = "课时统计代码")
+@AllArgsConstructor
+public class ClassTimeStatisticsController {
+
+
+    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())
+                .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){
+        ClassTimeStatistics classTimeStatistics = BeanUtil.toBean(dto, ClassTimeStatistics.class);
+        boolean isSuccess = classTimeStatisticsService.add(classTimeStatistics);
+    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.update(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);
+        return RT.ok(true);
+    }
+
+}

+ 117 - 0
src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeStatisticsSetController.java

@@ -0,0 +1,117 @@
+package com.xjrsoft.module.classtime.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+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.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.classtime.dto.AddClassTimeStatisticsSetDto;
+import com.xjrsoft.module.classtime.dto.ClassTimeStatisticsSetPageDto;
+import com.xjrsoft.module.classtime.dto.UpdateClassTimeStatisticsSetDto;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsSet;
+import com.xjrsoft.module.classtime.service.IClassTimeStatisticsSetService;
+import com.xjrsoft.module.classtime.vo.ClassTimeStatisticsSetPageVo;
+import com.xjrsoft.module.classtime.vo.ClassTimeStatisticsSetVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+
+/**
+* @title: 课时统计-设置
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/classtime" + "/classTimeStatisticsSet")
+@Api(value = "/classtime"  + "/classTimeStatisticsSet",tags = "课时统计-设置代码")
+@AllArgsConstructor
+public class ClassTimeStatisticsSetController {
+
+
+    private final IClassTimeStatisticsSetService classTimeStatisticsSetService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="课时统计-设置列表(分页)")
+    @SaCheckPermission("classtimestatisticsset:detail")
+    public RT<PageOutput<ClassTimeStatisticsSetPageVo>> page(@Valid ClassTimeStatisticsSetPageDto dto){
+
+        LambdaQueryWrapper<ClassTimeStatisticsSet> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(ClassTimeStatisticsSet::getId)
+                .select(ClassTimeStatisticsSet.class,x -> VoToColumnUtil.fieldsToColumns(ClassTimeStatisticsSetPageVo.class).contains(x.getProperty()));
+        IPage<ClassTimeStatisticsSet> page = classTimeStatisticsSetService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<ClassTimeStatisticsSetPageVo> pageOutput = ConventPage.getPageOutput(page, ClassTimeStatisticsSetPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询课时统计-设置信息")
+    @SaCheckPermission("classtimestatisticsset:detail")
+    public RT<ClassTimeStatisticsSetVo> info(@RequestParam Long id){
+        ClassTimeStatisticsSet classTimeStatisticsSet = classTimeStatisticsSetService.getById(id);
+        if (classTimeStatisticsSet == null) {
+           return RT.error("找不到此数据!");
+        }
+        return RT.ok(BeanUtil.toBean(classTimeStatisticsSet, ClassTimeStatisticsSetVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增课时统计-设置")
+    @SaCheckPermission("classtimestatisticsset:add")
+    public RT<Boolean> add(@Valid @RequestBody AddClassTimeStatisticsSetDto dto){
+        ClassTimeStatisticsSet classTimeStatisticsSet = BeanUtil.toBean(dto, ClassTimeStatisticsSet.class);
+        classTimeStatisticsSet.setCreateDate(new Date());
+        boolean isSuccess = classTimeStatisticsSetService.save(classTimeStatisticsSet);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改课时统计-设置")
+    @SaCheckPermission("classtimestatisticsset:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateClassTimeStatisticsSetDto dto){
+        ClassTimeStatisticsSet classTimeStatisticsSet = BeanUtil.toBean(dto, ClassTimeStatisticsSet.class);
+        classTimeStatisticsSet.setModifyDate(new Date());
+        return RT.ok(classTimeStatisticsSetService.updateById(classTimeStatisticsSet));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除课时统计-设置")
+    @SaCheckPermission("classtimestatisticsset:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(classTimeStatisticsSetService.removeBatchByIds(ids));
+    }
+
+    @GetMapping(value = "/last-info")
+    @ApiOperation(value="查询最新设置信息")
+    @SaCheckPermission("classtimestatisticsset:detail")
+    public RT<ClassTimeStatisticsSetVo> lastInfo(@RequestParam Integer category){
+        List<ClassTimeStatisticsSet> list = classTimeStatisticsSetService.list(
+                new QueryWrapper<ClassTimeStatisticsSet>().lambda().eq(ClassTimeStatisticsSet::getCategory, category)
+        );
+        if (list.isEmpty()) {
+            return RT.ok();
+        }
+        ClassTimeStatisticsSet classTimeStatisticsSet = list.get(0);
+        return RT.ok(BeanUtil.toBean(classTimeStatisticsSet, ClassTimeStatisticsSetVo.class));
+    }
+
+}

+ 43 - 0
src/main/java/com/xjrsoft/module/classtime/dto/AddClassTimeStatisticsDto.java

@@ -0,0 +1,43 @@
+package com.xjrsoft.module.classtime.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+* @title: 课时统计
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class AddClassTimeStatisticsDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 统计年份
+    */
+    @ApiModelProperty("统计年份")
+    private Integer year;
+    /**
+    * 统计月份
+    */
+    @ApiModelProperty("统计月份")
+    private Integer month;
+    /**
+    * 开始日期
+    */
+    @ApiModelProperty("开始日期")
+    private Date startDate;
+    /**
+    * 结束日期
+    */
+    @ApiModelProperty("结束日期")
+    private Date endDate;
+
+}

+ 128 - 0
src/main/java/com/xjrsoft/module/classtime/dto/AddClassTimeStatisticsRecordDto.java

@@ -0,0 +1,128 @@
+package com.xjrsoft.module.classtime.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+* @title: 课时统计-教师详情
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class AddClassTimeStatisticsRecordDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 课时统计(class_time_statistics)
+    */
+    @ApiModelProperty("课时统计(class_time_statistics)")
+    private Long classTimeStatisticsId;
+    /**
+    * 教师id(xjr_user)
+    */
+    @ApiModelProperty("教师id(xjr_user)")
+    private Long userId;
+    /**
+    * 聘用类型
+    */
+    @ApiModelProperty("聘用类型")
+    private Date employType;
+    /**
+    * 总课时
+    */
+    @ApiModelProperty("总课时")
+    private Double allClassTime;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 课时费用
+    */
+    @ApiModelProperty("课时费用")
+    private Double classTimeAmount;
+    /**
+    * 外聘教师超课时费
+    */
+    @ApiModelProperty("外聘教师超课时费")
+    private Double beyondClassTimeAmount;
+    /**
+    * 每周数据
+    */
+    @ApiModelProperty("每周数据")
+    private String weekData;
+    /**
+    * 教研会
+    */
+    @ApiModelProperty("教研会")
+    private Double classTime1;
+    /**
+    * 督导听课
+    */
+    @ApiModelProperty("督导听课")
+    private Double classTime2;
+    /**
+    * 临近三年退休政策
+    */
+    @ApiModelProperty("临近三年退休政策")
+    private Double classTime3;
+    /**
+    * 出题
+    */
+    @ApiModelProperty("出题")
+    private Double classTime4;
+    /**
+    * 阅卷
+    */
+    @ApiModelProperty("阅卷")
+    private Double classTime5;
+    /**
+    * 周末培优
+    */
+    @ApiModelProperty("周末培优")
+    private Double classTime6;
+    /**
+    * 早自习
+    */
+    @ApiModelProperty("早自习")
+    private Double classTime7;
+    /**
+    * 正课(包含调顶课时)
+    */
+    @ApiModelProperty("正课(包含调顶课时)")
+    private Double classTime8;
+    /**
+    * 晚辅(包含调顶课时)
+    */
+    @ApiModelProperty("晚辅(包含调顶课时)")
+    private Double classTime9;
+    /**
+    * 顶课
+    */
+    @ApiModelProperty("顶课")
+    private Double classTime10;
+    /**
+    * 调课
+    */
+    @ApiModelProperty("调课")
+    private Double classTime11;
+    /**
+    * 权重json
+    */
+    @ApiModelProperty("权重json")
+    private String weightSetJson;
+    /**
+    * 权重json
+    */
+    @ApiModelProperty("权重json")
+    private String costSetJson;
+
+}

+ 32 - 0
src/main/java/com/xjrsoft/module/classtime/dto/AddClassTimeStatisticsSetDto.java

@@ -0,0 +1,32 @@
+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 AddClassTimeStatisticsSetDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 权重内容
+    */
+    @ApiModelProperty("权重内容")
+    private String jsonContent;
+    /**
+    * 类别(1:权重 2:费用设置)
+    */
+    @ApiModelProperty("类别(1:权重 2:费用设置)")
+    private Integer category;
+
+}

+ 25 - 0
src/main/java/com/xjrsoft/module/classtime/dto/ClassTimeStatisticsPageDto.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.classtime.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 课时统计分页查询入参
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ClassTimeStatisticsPageDto extends PageInput {
+
+    @ApiModelProperty("统计年份")
+    private Integer year;
+
+
+    @ApiModelProperty("统计月份")
+    private Integer month;
+}

+ 19 - 0
src/main/java/com/xjrsoft/module/classtime/dto/ClassTimeStatisticsSetPageDto.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.classtime.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 课时统计-设置分页查询入参
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ClassTimeStatisticsSetPageDto extends PageInput {
+
+
+}

+ 24 - 0
src/main/java/com/xjrsoft/module/classtime/dto/UpdateClassTimeStatisticsDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.classtime.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 课时统计
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class UpdateClassTimeStatisticsDto extends AddClassTimeStatisticsDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

+ 24 - 0
src/main/java/com/xjrsoft/module/classtime/dto/UpdateClassTimeStatisticsSetDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.classtime.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 课时统计-设置
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class UpdateClassTimeStatisticsSetDto extends AddClassTimeStatisticsSetDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

+ 119 - 0
src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeStatistics.java

@@ -0,0 +1,119 @@
+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-09-26
+* @Version 1.0
+*/
+@Data
+@TableName("class_time_statistics")
+@ApiModel(value = "class_time_statistics", description = "课时统计")
+public class ClassTimeStatistics 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;
+    /**
+    * 统计年份
+    */
+    @ApiModelProperty("统计年份")
+    private Integer year;
+    /**
+    * 统计月份
+    */
+    @ApiModelProperty("统计月份")
+    private Integer month;
+    /**
+    * 开始日期
+    */
+    @ApiModelProperty("开始日期")
+    private Date startDate;
+    /**
+    * 结束日期
+    */
+    @ApiModelProperty("结束日期")
+    private Date endDate;
+    /**
+    * 总课时
+    */
+    @ApiModelProperty("总课时")
+    private Double allClassTime;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 总课时费用
+    */
+    @ApiModelProperty("总课时费用")
+    private Double classTimeAmount;
+    /**
+    * 总外聘教师超课时费
+    */
+    @ApiModelProperty("总外聘教师超课时费")
+    private Double beyondClassTimeAmount;
+    /**
+    * 状态(0:已解锁 1:已锁定)
+    */
+    @ApiModelProperty("状态(0:已解锁 1:已锁定)")
+    private Integer status;
+
+
+}

+ 179 - 0
src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeStatisticsRecord.java

@@ -0,0 +1,179 @@
+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-09-26
+* @Version 1.0
+*/
+@Data
+@TableName("class_time_statistics_record")
+@ApiModel(value = "class_time_statistics_record", description = "课时统计-教师详情")
+public class ClassTimeStatisticsRecord 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 Date employType;
+    /**
+    * 总课时
+    */
+    @ApiModelProperty("总课时")
+    private Double allClassTime;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 课时费用
+    */
+    @ApiModelProperty("课时费用")
+    private Double classTimeAmount;
+    /**
+    * 外聘教师超课时费
+    */
+    @ApiModelProperty("外聘教师超课时费")
+    private Double beyondClassTimeAmount;
+    /**
+    * 每周数据
+    */
+    @ApiModelProperty("每周数据")
+    private String weekData;
+    /**
+    * 教研会
+    */
+    @ApiModelProperty("教研会")
+    private Double classTime1;
+    /**
+    * 督导听课
+    */
+    @ApiModelProperty("督导听课")
+    private Double classTime2;
+    /**
+    * 临近三年退休政策
+    */
+    @ApiModelProperty("临近三年退休政策")
+    private Double classTime3;
+    /**
+    * 出题
+    */
+    @ApiModelProperty("出题")
+    private Double classTime4;
+    /**
+    * 阅卷
+    */
+    @ApiModelProperty("阅卷")
+    private Double classTime5;
+    /**
+    * 周末培优
+    */
+    @ApiModelProperty("周末培优")
+    private Double classTime6;
+    /**
+    * 早自习
+    */
+    @ApiModelProperty("早自习")
+    private Double classTime7;
+    /**
+    * 正课(包含调顶课时)
+    */
+    @ApiModelProperty("正课(包含调顶课时)")
+    private Double classTime8;
+    /**
+    * 晚辅(包含调顶课时)
+    */
+    @ApiModelProperty("晚辅(包含调顶课时)")
+    private Double classTime9;
+    /**
+    * 顶课
+    */
+    @ApiModelProperty("顶课")
+    private Double classTime10;
+    /**
+    * 调课
+    */
+    @ApiModelProperty("调课")
+    private Double classTime11;
+    /**
+    * 权重json
+    */
+    @ApiModelProperty("权重json")
+    private String weightSetJson;
+    /**
+    * 权重json
+    */
+    @ApiModelProperty("权重json")
+    private String costSetJson;
+
+
+}

+ 84 - 0
src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeStatisticsSet.java

@@ -0,0 +1,84 @@
+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-09-26
+* @Version 1.0
+*/
+@Data
+@TableName("class_time_statistics_set")
+@ApiModel(value = "class_time_statistics_set", description = "课时统计-设置")
+public class ClassTimeStatisticsSet 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;
+    /**
+    * 权重内容
+    */
+    @ApiModelProperty("权重内容")
+    private String jsonContent;
+    /**
+    * 类别(1:权重 2:费用设置)
+    */
+    @ApiModelProperty("类别(1:权重 2:费用设置)")
+    private Integer category;
+
+
+}

+ 16 - 0
src/main/java/com/xjrsoft/module/classtime/mapper/ClassTimeStatisticsMapper.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.classtime.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatistics;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 课时统计
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Mapper
+public interface ClassTimeStatisticsMapper extends MPJBaseMapper<ClassTimeStatistics> {
+
+}

+ 16 - 0
src/main/java/com/xjrsoft/module/classtime/mapper/ClassTimeStatisticsRecordMapper.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.classtime.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 课时统计-教师详情
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Mapper
+public interface ClassTimeStatisticsRecordMapper extends MPJBaseMapper<ClassTimeStatisticsRecord> {
+
+}

+ 16 - 0
src/main/java/com/xjrsoft/module/classtime/mapper/ClassTimeStatisticsSetMapper.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.classtime.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsSet;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 课时统计-设置
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Mapper
+public interface ClassTimeStatisticsSetMapper extends MPJBaseMapper<ClassTimeStatisticsSet> {
+
+}

+ 39 - 0
src/main/java/com/xjrsoft/module/classtime/service/IClassTimeStatisticsService.java

@@ -0,0 +1,39 @@
+package com.xjrsoft.module.classtime.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatistics;
+
+import java.util.List;
+
+/**
+* @title: 课时统计
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+
+public interface IClassTimeStatisticsService extends MPJBaseService<ClassTimeStatistics> {
+    /**
+    * 新增
+    *
+    * @param classTimeStatistics
+    * @return
+    */
+    Boolean add(ClassTimeStatistics classTimeStatistics);
+
+    /**
+    * 更新
+    *
+    * @param classTimeStatistics
+    * @return
+    */
+    Boolean update(ClassTimeStatistics classTimeStatistics);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+}

+ 14 - 0
src/main/java/com/xjrsoft/module/classtime/service/IClassTimeStatisticsSetService.java

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.classtime.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsSet;
+
+/**
+* @title: 课时统计-设置
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+
+public interface IClassTimeStatisticsSetService extends MPJBaseService<ClassTimeStatisticsSet> {
+}

+ 52 - 0
src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsServiceImpl.java

@@ -0,0 +1,52 @@
+package com.xjrsoft.module.classtime.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatistics;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsRecord;
+import com.xjrsoft.module.classtime.mapper.ClassTimeStatisticsMapper;
+import com.xjrsoft.module.classtime.mapper.ClassTimeStatisticsRecordMapper;
+import com.xjrsoft.module.classtime.service.IClassTimeStatisticsService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+* @title: 课时统计
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTimeStatisticsMapper, ClassTimeStatistics> implements IClassTimeStatisticsService {
+    private final ClassTimeStatisticsMapper statisticsMapper;
+
+    private final ClassTimeStatisticsRecordMapper recordMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(ClassTimeStatistics classTimeStatistics) {
+        statisticsMapper.insert(classTimeStatistics);
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(ClassTimeStatistics classTimeStatistics) {
+        statisticsMapper.updateById(classTimeStatistics);
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        statisticsMapper.deleteBatchIds(ids);
+        recordMapper.delete(Wrappers.lambdaQuery(ClassTimeStatisticsRecord.class).in(ClassTimeStatisticsRecord::getClassTimeStatisticsId, ids));
+
+        return true;
+    }
+}

+ 19 - 0
src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsSetServiceImpl.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.classtime.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsSet;
+import com.xjrsoft.module.classtime.mapper.ClassTimeStatisticsSetMapper;
+import com.xjrsoft.module.classtime.service.IClassTimeStatisticsSetService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 课时统计-设置
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class ClassTimeStatisticsSetServiceImpl extends MPJBaseServiceImpl<ClassTimeStatisticsSetMapper, ClassTimeStatisticsSet> implements IClassTimeStatisticsSetService {
+}

+ 98 - 0
src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsPageVo.java

@@ -0,0 +1,98 @@
+package com.xjrsoft.module.classtime.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 课时统计分页列表出参
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class ClassTimeStatisticsPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 统计年份
+    */
+    @ApiModelProperty("统计年份")
+    private Integer year;
+    /**
+    * 统计月份
+    */
+    @ApiModelProperty("统计月份")
+    private Integer month;
+    /**
+    * 开始日期
+    */
+    @ApiModelProperty("开始日期")
+    private Date startDate;
+    /**
+    * 结束日期
+    */
+    @ApiModelProperty("结束日期")
+    private Date endDate;
+    /**
+    * 总课时
+    */
+    @ApiModelProperty("总课时")
+    private Double allClassTime;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 总课时费用
+    */
+    @ApiModelProperty("总课时费用")
+    private Double classTimeAmount;
+    /**
+    * 总外聘教师超课时费
+    */
+    @ApiModelProperty("总外聘教师超课时费")
+    private Double beyondClassTimeAmount;
+    /**
+    * 状态(0:已解锁 1:已锁定)
+    */
+    @ApiModelProperty("状态(0:已解锁 1:已锁定)")
+    private Integer status;
+
+}

+ 130 - 0
src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsRecordVo.java

@@ -0,0 +1,130 @@
+package com.xjrsoft.module.classtime.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 课时统计-教师详情表单出参
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class ClassTimeStatisticsRecordVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 课时统计(class_time_statistics)
+    */
+    @ApiModelProperty("课时统计(class_time_statistics)")
+    private Long classTimeStatisticsId;
+    /**
+    * 教师id(xjr_user)
+    */
+    @ApiModelProperty("教师id(xjr_user)")
+    private Long userId;
+    /**
+    * 聘用类型
+    */
+    @ApiModelProperty("聘用类型")
+    private Date employType;
+    /**
+    * 总课时
+    */
+    @ApiModelProperty("总课时")
+    private Double allClassTime;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 课时费用
+    */
+    @ApiModelProperty("课时费用")
+    private Double classTimeAmount;
+    /**
+    * 外聘教师超课时费
+    */
+    @ApiModelProperty("外聘教师超课时费")
+    private Double beyondClassTimeAmount;
+    /**
+    * 每周数据
+    */
+    @ApiModelProperty("每周数据")
+    private String weekData;
+    /**
+    * 教研会
+    */
+    @ApiModelProperty("教研会")
+    private Double classTime1;
+    /**
+    * 督导听课
+    */
+    @ApiModelProperty("督导听课")
+    private Double classTime2;
+    /**
+    * 临近三年退休政策
+    */
+    @ApiModelProperty("临近三年退休政策")
+    private Double classTime3;
+    /**
+    * 出题
+    */
+    @ApiModelProperty("出题")
+    private Double classTime4;
+    /**
+    * 阅卷
+    */
+    @ApiModelProperty("阅卷")
+    private Double classTime5;
+    /**
+    * 周末培优
+    */
+    @ApiModelProperty("周末培优")
+    private Double classTime6;
+    /**
+    * 早自习
+    */
+    @ApiModelProperty("早自习")
+    private Double classTime7;
+    /**
+    * 正课(包含调顶课时)
+    */
+    @ApiModelProperty("正课(包含调顶课时)")
+    private Double classTime8;
+    /**
+    * 晚辅(包含调顶课时)
+    */
+    @ApiModelProperty("晚辅(包含调顶课时)")
+    private Double classTime9;
+    /**
+    * 顶课
+    */
+    @ApiModelProperty("顶课")
+    private Double classTime10;
+    /**
+    * 调课
+    */
+    @ApiModelProperty("调课")
+    private Double classTime11;
+    /**
+    * 权重json
+    */
+    @ApiModelProperty("权重json")
+    private String weightSetJson;
+    /**
+    * 权重json
+    */
+    @ApiModelProperty("权重json")
+    private String costSetJson;
+
+
+
+}

+ 63 - 0
src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsSetPageVo.java

@@ -0,0 +1,63 @@
+package com.xjrsoft.module.classtime.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 课时统计-设置分页列表出参
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class ClassTimeStatisticsSetPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 权重内容
+    */
+    @ApiModelProperty("权重内容")
+    private String jsonContent;
+    /**
+    * 类别(1:权重 2:费用设置)
+    */
+    @ApiModelProperty("类别(1:权重 2:费用设置)")
+    private Integer category;
+
+}

+ 33 - 0
src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsSetVo.java

@@ -0,0 +1,33 @@
+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 ClassTimeStatisticsSetVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 权重内容
+    */
+    @ApiModelProperty("权重内容")
+    private String jsonContent;
+    /**
+    * 类别(1:权重 2:费用设置)
+    */
+    @ApiModelProperty("类别(1:权重 2:费用设置)")
+    private Integer category;
+
+
+
+}

+ 76 - 0
src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeStatisticsVo.java

@@ -0,0 +1,76 @@
+package com.xjrsoft.module.classtime.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* @title: 课时统计表单出参
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Data
+public class ClassTimeStatisticsVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 统计年份
+    */
+    @ApiModelProperty("统计年份")
+    private Integer year;
+    /**
+    * 统计月份
+    */
+    @ApiModelProperty("统计月份")
+    private Integer month;
+    /**
+    * 开始日期
+    */
+    @ApiModelProperty("开始日期")
+    private Date startDate;
+    /**
+    * 结束日期
+    */
+    @ApiModelProperty("结束日期")
+    private Date endDate;
+    /**
+    * 总课时
+    */
+    @ApiModelProperty("总课时")
+    private Double allClassTime;
+    /**
+    * 总金额
+    */
+    @ApiModelProperty("总金额")
+    private Double totalAmount;
+    /**
+    * 总课时费用
+    */
+    @ApiModelProperty("总课时费用")
+    private Double classTimeAmount;
+    /**
+    * 总外聘教师超课时费
+    */
+    @ApiModelProperty("总外聘教师超课时费")
+    private Double beyondClassTimeAmount;
+    /**
+    * 状态(0:已解锁 1:已锁定)
+    */
+    @ApiModelProperty("状态(0:已解锁 1:已锁定)")
+    private Integer status;
+
+
+    /**
+    * classTimeStatisticsRecord
+    */
+    @ApiModelProperty("classTimeStatisticsRecord子表")
+    private List<ClassTimeStatisticsRecordVo> classTimeStatisticsRecordList;
+
+}

+ 1 - 1
src/main/java/com/xjrsoft/module/ledger/controller/LedgerCustomController.java

@@ -31,7 +31,7 @@ public class LedgerCustomController {
 
 
     @PutMapping
-    @ApiOperation(value = "修改状态(仅限于表中有delete_mark)")
+    @ApiOperation(value = "修改状态(仅限于表中有enabled_mark)")
     @SaCheckPermission("ledgerconfigrelease:edit")
     public RT<Boolean> update(@Valid @RequestBody LedgerCustomUpdateDto dto){
         Entity params = Entity.create(dto.getTableName());

+ 61 - 0
src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -3767,4 +3767,65 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcClassTimeStatistics() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("class_time_statistics");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表,一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        mainTable = new TableConfig();
+        mainTable.setTableName("class_time_statistics_record");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表,一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("class_time_statistics_id");//设置外键
+        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
+        tableConfigs.add(mainTable);
+
+
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("classtime");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录,前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    @Test
+    public void gcClassTimeStatisticsSet() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("class_time_statistics_set");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表,一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("classtime");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录,前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }