1、课时删除

2、节假日设置

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

@@ -0,0 +1,101 @@
+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.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.AddClassTimeCalendarDto;
+import com.xjrsoft.module.classtime.dto.ClassTimeCalendarPageDto;
+import com.xjrsoft.module.classtime.dto.UpdateClassTimeCalendarDto;
+import com.xjrsoft.module.classtime.entity.ClassTimeCalendar;
+import com.xjrsoft.module.classtime.service.IClassTimeCalendarService;
+import com.xjrsoft.module.classtime.vo.ClassTimeCalendarPageVo;
+import com.xjrsoft.module.classtime.vo.ClassTimeCalendarVo;
+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" + "/classTimeCalendar")
+@Api(value = "/classtime"  + "/classTimeCalendar",tags = "节假日调课设置代码")
+@AllArgsConstructor
+public class ClassTimeCalendarController {
+
+
+    private final IClassTimeCalendarService classTimeCalendarService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="节假日调课设置列表(分页)")
+    @SaCheckPermission("classtimecalendar:detail")
+    public RT<PageOutput<ClassTimeCalendarPageVo>> page(@Valid ClassTimeCalendarPageDto dto){
+
+        LambdaQueryWrapper<ClassTimeCalendar> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(ClassTimeCalendar::getId)
+                .select(ClassTimeCalendar.class,x -> VoToColumnUtil.fieldsToColumns(ClassTimeCalendarPageVo.class).contains(x.getProperty()));
+        IPage<ClassTimeCalendar> page = classTimeCalendarService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<ClassTimeCalendarPageVo> pageOutput = ConventPage.getPageOutput(page, ClassTimeCalendarPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询节假日调课设置信息")
+    @SaCheckPermission("classtimecalendar:detail")
+    public RT<ClassTimeCalendarVo> info(@RequestParam Long id){
+        ClassTimeCalendar classTimeCalendar = classTimeCalendarService.getById(id);
+        if (classTimeCalendar == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(classTimeCalendar, ClassTimeCalendarVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增节假日调课设置")
+    @SaCheckPermission("classtimecalendar:add")
+    public RT<Boolean> add(@Valid @RequestBody AddClassTimeCalendarDto dto){
+        ClassTimeCalendar classTimeCalendar = BeanUtil.toBean(dto, ClassTimeCalendar.class);
+        boolean isSuccess = classTimeCalendarService.save(classTimeCalendar);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改节假日调课设置")
+    @SaCheckPermission("classtimecalendar:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateClassTimeCalendarDto dto){
+
+        ClassTimeCalendar classTimeCalendar = BeanUtil.toBean(dto, ClassTimeCalendar.class);
+        return RT.ok(classTimeCalendarService.updateById(classTimeCalendar));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除节假日调课设置")
+    @SaCheckPermission("classtimecalendar:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(classTimeCalendarService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -0,0 +1,116 @@
+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.AddClassTimeDeleteDto;
+import com.xjrsoft.module.classtime.dto.ClassTimeDeletePageDto;
+import com.xjrsoft.module.classtime.dto.UpdateClassTimeDeleteDto;
+import com.xjrsoft.module.classtime.entity.ClassTimeDelete;
+import com.xjrsoft.module.classtime.service.IClassTimeDeleteService;
+import com.xjrsoft.module.classtime.vo.ClassTimeDeletePageVo;
+import com.xjrsoft.module.classtime.vo.ClassTimeDeleteVo;
+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" + "/classTimeDelete")
+@Api(value = "/classtime"  + "/classTimeDelete",tags = "课时删除代码")
+@AllArgsConstructor
+public class ClassTimeDeleteController {
+
+
+    private final IClassTimeDeleteService classTimeDeleteService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="课时删除列表(分页)")
+    @SaCheckPermission("classtimedelete:detail")
+    public RT<PageOutput<ClassTimeDeletePageVo>> page(@Valid ClassTimeDeletePageDto dto){
+
+        LambdaQueryWrapper<ClassTimeDelete> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(ClassTimeDelete::getId)
+                .select(ClassTimeDelete.class,x -> VoToColumnUtil.fieldsToColumns(ClassTimeDeletePageVo.class).contains(x.getProperty()));
+        IPage<ClassTimeDelete> page = classTimeDeleteService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<ClassTimeDeletePageVo> pageOutput = ConventPage.getPageOutput(page, ClassTimeDeletePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询课时删除信息")
+    @SaCheckPermission("classtimedelete:detail")
+    public RT<ClassTimeDeleteVo> info(@RequestParam Long id){
+        ClassTimeDelete classTimeDelete = classTimeDeleteService.getById(id);
+        if (classTimeDelete == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(classTimeDelete, ClassTimeDeleteVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增课时删除")
+    @SaCheckPermission("classtimedelete:add")
+    public RT<Boolean> add(@Valid @RequestBody AddClassTimeDeleteDto dto){
+        ClassTimeDelete classTimeDelete = BeanUtil.toBean(dto, ClassTimeDelete.class);
+        boolean isSuccess = classTimeDeleteService.save(classTimeDelete);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改课时删除")
+    @SaCheckPermission("classtimedelete:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateClassTimeDeleteDto dto){
+
+        ClassTimeDelete classTimeDelete = BeanUtil.toBean(dto, ClassTimeDelete.class);
+        return RT.ok(classTimeDeleteService.updateById(classTimeDelete));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除课时删除")
+    @SaCheckPermission("classtimedelete:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(classTimeDeleteService.removeBatchByIds(ids));
+
+    }
+
+    @PostMapping(value = "/change-status")
+    @ApiOperation(value="修改状态")
+    @SaCheckPermission("classtimestatistics:detail")
+    public RT<Boolean> changeStatus(@Valid @RequestBody ChangeStatusDto dto) throws Exception {
+        ClassTimeDelete classTimeDelete = classTimeDeleteService.getById(dto.getId());
+        if(classTimeDelete == null){
+            throw new MyException("未能查到数据");
+        }
+        classTimeDelete.setEnabledMark(dto.getStatus());
+        classTimeDeleteService.updateById(classTimeDelete);
+        return RT.ok(true);
+    }
+
+}

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

@@ -0,0 +1,38 @@
+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 AddClassTimeCalendarDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 课时统计(class_time_statistics)
+    */
+    @ApiModelProperty("课时统计(class_time_statistics)")
+    private Long classTimeStatisticsId;
+    /**
+    * 补班日期
+    */
+    @ApiModelProperty("补班日期")
+    private Integer supplementDate;
+    /**
+    * 补课日期
+    */
+    @ApiModelProperty("补课日期")
+    private Date replaceDate;
+
+}

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

@@ -0,0 +1,48 @@
+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 AddClassTimeDeleteDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 删除类型(xjr_dictionary_item[class_time_delete])
+    */
+    @ApiModelProperty("删除类型(xjr_dictionary_item[class_time_delete])")
+    private String type;
+    /**
+    * 类别(1:权重 2:费用设置)
+    */
+    @ApiModelProperty("类别(1:权重 2:费用设置)")
+    private Integer classId;
+    /**
+    * 删除说明
+    */
+    @ApiModelProperty("删除说明")
+    private String remark;
+    /**
+    * 开始日期
+    */
+    @ApiModelProperty("开始日期")
+    private Date startDate;
+    /**
+    * 结束日期
+    */
+    @ApiModelProperty("结束日期")
+    private Date endDate;
+
+}

src/main/java/com/xjrsoft/module/classtime/dto/ClassTimeCalendarPageDto.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 ClassTimeCalendarPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/classtime/dto/ClassTimeDeletePageDto.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 ClassTimeDeletePageDto extends PageInput {
+
+
+}

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

@@ -2,10 +2,8 @@ package com.xjrsoft.module.classtime.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 
 
 /**

src/main/java/com/xjrsoft/module/classtime/dto/UpdateClassTimeCalendarDto.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 UpdateClassTimeCalendarDto extends AddClassTimeCalendarDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/classtime/dto/UpdateClassTimeDeleteDto.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 UpdateClassTimeDeleteDto extends AddClassTimeDeleteDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,89 @@
+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_calendar")
+@ApiModel(value = "class_time_calendar", description = "节假日调课设置")
+public class ClassTimeCalendar 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;
+    /**
+    * 补班日期
+    */
+    @ApiModelProperty("补班日期")
+    private Integer supplementDate;
+    /**
+    * 补课日期
+    */
+    @ApiModelProperty("补课日期")
+    private Date replaceDate;
+
+
+}

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

@@ -0,0 +1,99 @@
+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_delete")
+@ApiModel(value = "class_time_delete", description = "课时删除")
+public class ClassTimeDelete 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;
+    /**
+    * 删除类型(xjr_dictionary_item[class_time_delete])
+    */
+    @ApiModelProperty("删除类型(xjr_dictionary_item[class_time_delete])")
+    private String type;
+    /**
+    * 类别(1:权重 2:费用设置)
+    */
+    @ApiModelProperty("类别(1:权重 2:费用设置)")
+    private Integer classId;
+    /**
+    * 删除说明
+    */
+    @ApiModelProperty("删除说明")
+    private String remark;
+    /**
+    * 开始日期
+    */
+    @ApiModelProperty("开始日期")
+    private Date startDate;
+    /**
+    * 结束日期
+    */
+    @ApiModelProperty("结束日期")
+    private Date endDate;
+
+
+}

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

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

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

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

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

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.classtime.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.classtime.entity.ClassTimeCalendar;
+
+/**
+* @title: 节假日调课设置
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+
+public interface IClassTimeCalendarService extends MPJBaseService<ClassTimeCalendar> {
+}

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

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

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

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.classtime.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.classtime.entity.ClassTimeCalendar;
+import com.xjrsoft.module.classtime.mapper.ClassTimeCalendarMapper;
+import com.xjrsoft.module.classtime.service.IClassTimeCalendarService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 节假日调课设置
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class ClassTimeCalendarServiceImpl extends MPJBaseServiceImpl<ClassTimeCalendarMapper, ClassTimeCalendar> implements IClassTimeCalendarService {
+}

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

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.classtime.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.classtime.entity.ClassTimeDelete;
+import com.xjrsoft.module.classtime.mapper.ClassTimeDeleteMapper;
+import com.xjrsoft.module.classtime.service.IClassTimeDeleteService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 课时删除
+* @Author dzx
+* @Date: 2024-09-26
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class ClassTimeDeleteServiceImpl extends MPJBaseServiceImpl<ClassTimeDeleteMapper, ClassTimeDelete> implements IClassTimeDeleteService {
+}

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.module.classtime.dto.AddClassTimeStatisticsDto;
 import com.xjrsoft.module.classtime.entity.ClassTimeStatistics;
 import com.xjrsoft.module.classtime.entity.ClassTimeStatisticsRecord;
@@ -13,9 +12,6 @@ import com.xjrsoft.module.classtime.mapper.ClassTimeStatisticsMapper;
 import com.xjrsoft.module.classtime.mapper.ClassTimeStatisticsRecordMapper;
 import com.xjrsoft.module.classtime.service.IClassTimeStatisticsService;
 import com.xjrsoft.module.classtime.service.IClassTimeStatisticsSetService;
-import com.xjrsoft.module.organization.entity.User;
-import com.xjrsoft.module.organization.entity.UserDeptRelation;
-import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -0,0 +1,68 @@
+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 ClassTimeCalendarPageVo {
+
+    /**
+    * 主键编号
+    */
+    @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;
+    /**
+    * 课时统计(class_time_statistics)
+    */
+    @ApiModelProperty("课时统计(class_time_statistics)")
+    private Long classTimeStatisticsId;
+    /**
+    * 补班日期
+    */
+    @ApiModelProperty("补班日期")
+    private Integer supplementDate;
+    /**
+    * 补课日期
+    */
+    @ApiModelProperty("补课日期")
+    private Date replaceDate;
+
+}

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

@@ -0,0 +1,40 @@
+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 ClassTimeCalendarVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 课时统计(class_time_statistics)
+    */
+    @ApiModelProperty("课时统计(class_time_statistics)")
+    private Long classTimeStatisticsId;
+    /**
+    * 补班日期
+    */
+    @ApiModelProperty("补班日期")
+    private Integer supplementDate;
+    /**
+    * 补课日期
+    */
+    @ApiModelProperty("补课日期")
+    private Date replaceDate;
+
+
+
+}

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

@@ -0,0 +1,78 @@
+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 ClassTimeDeletePageVo {
+
+    /**
+    * 主键编号
+    */
+    @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("有效标志(0:作废 1:启用 2:锁定)")
+    private Integer enabledMark;
+    /**
+    * 删除类型(xjr_dictionary_item[class_time_delete])
+    */
+    @ApiModelProperty("删除类型(xjr_dictionary_item[class_time_delete])")
+    private String type;
+    /**
+    * 类别(1:权重 2:费用设置)
+    */
+    @ApiModelProperty("类别(1:权重 2:费用设置)")
+    private Integer classId;
+    /**
+    * 删除说明
+    */
+    @ApiModelProperty("删除说明")
+    private String remark;
+    /**
+    * 开始日期
+    */
+    @ApiModelProperty("开始日期")
+    private Date startDate;
+    /**
+    * 结束日期
+    */
+    @ApiModelProperty("结束日期")
+    private Date endDate;
+
+}

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

@@ -0,0 +1,50 @@
+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 ClassTimeDeleteVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 删除类型(xjr_dictionary_item[class_time_delete])
+    */
+    @ApiModelProperty("删除类型(xjr_dictionary_item[class_time_delete])")
+    private String type;
+    /**
+    * 类别(1:权重 2:费用设置)
+    */
+    @ApiModelProperty("类别(1:权重 2:费用设置)")
+    private Integer classId;
+    /**
+    * 删除说明
+    */
+    @ApiModelProperty("删除说明")
+    private String remark;
+    /**
+    * 开始日期
+    */
+    @ApiModelProperty("开始日期")
+    private Date startDate;
+    /**
+    * 结束日期
+    */
+    @ApiModelProperty("结束日期")
+    private Date endDate;
+
+
+
+}

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 /**
 * @title: 课时统计表单出参

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -3808,7 +3808,7 @@ public class FreeMarkerGeneratorTest {
     public void gcClassTimeStatisticsSet() throws IOException {
         List<TableConfig> tableConfigs = new ArrayList<>();
         TableConfig mainTable = new TableConfig();
-        mainTable.setTableName("class_time_statistics_set");//init_sql中的表名
+        mainTable.setTableName("class_time_calendar");//init_sql中的表名
         mainTable.setIsMain(true);//是否是主表，一般默认为true
         mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
         mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型