Merge branch 'pre'

src/main/java/com/xjrsoft/module/activity/dto/ActivityEnrollExportDto.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.activity.dto;
 
-import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentPlanAnswerController.java

@@ -3,7 +3,6 @@ package com.xjrsoft.module.assessment.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xjrsoft.common.enums.RoleEnum;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;

src/main/java/com/xjrsoft/module/attendance/controller/AttendanceStatisticsController.java

@@ -12,9 +12,9 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.activity.dto.ChangeStatusDto;
 import com.xjrsoft.module.attendance.dto.AddAttendanceStatisticsDto;
-import com.xjrsoft.module.attendance.dto.AttendanceStatisticsRecordDto;
 import com.xjrsoft.module.attendance.dto.AttendanceRuleCategoryListDto;
 import com.xjrsoft.module.attendance.dto.AttendanceStatisticsPageDto;
+import com.xjrsoft.module.attendance.dto.AttendanceStatisticsRecordDto;
 import com.xjrsoft.module.attendance.dto.UpdateAttendanceStatisticsDto;
 import com.xjrsoft.module.attendance.entity.AttendanceRuleCategory;
 import com.xjrsoft.module.attendance.entity.AttendanceStatistics;

src/main/java/com/xjrsoft/module/attendance/controller/TeacherStatisticsController.java

@@ -21,7 +21,6 @@ import com.xjrsoft.module.attendance.vo.AttendanceRuleDetailsUserVo;
 import com.xjrsoft.module.attendance.vo.TeacherStatisticsPageVo;
 import com.xjrsoft.module.holiday.entity.HolidayDate;
 import com.xjrsoft.module.holiday.service.IHolidayDateService;
-import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.organization.service.IUserService;
@@ -32,9 +31,7 @@ import com.xjrsoft.module.outint.service.ICarOutInRecordService;
 import com.xjrsoft.module.outint.service.ITeacherOutInRecordService;
 import com.xjrsoft.module.personnel.entity.CarMessageApply;
 import com.xjrsoft.module.teacher.entity.BaseTeacher;
-import com.xjrsoft.module.teacher.entity.WfHeadTeacherLeave;
 import com.xjrsoft.module.teacher.entity.WfTeacherleave;
-import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.service.IWfHeadTeacherLeaveService;
 import com.xjrsoft.module.teacher.service.IWfTeacherleaveService;
 import io.swagger.annotations.Api;

src/main/java/com/xjrsoft/module/attendance/dto/AddAttendanceStatisticsDto.java

@@ -6,8 +6,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.Date;
-import java.util.List;
 
 
 

src/main/java/com/xjrsoft/module/attendance/entity/TeacherAttendanceRecord.java

@@ -12,7 +12,6 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.Date;
 
 

src/main/java/com/xjrsoft/module/attendance/mapper/TeacherAttendanceRecordMapper.java

@@ -2,10 +2,8 @@ package com.xjrsoft.module.attendance.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.attendance.dto.AttendanceStatisticsPageDto;
 import com.xjrsoft.module.attendance.dto.TeacherDetailsDto;
 import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
-import com.xjrsoft.module.attendance.vo.AttendanceStatisticsPageVo;
 import com.xjrsoft.module.attendance.vo.TeacherStatisticsPageVo;
 import com.xjrsoft.module.teacher.entity.WfTeacherleave;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/xjrsoft/module/attendance/service/ITeacherAttendanceRecordService.java

@@ -6,7 +6,6 @@ import com.xjrsoft.module.attendance.dto.ResetTeacherAttendanceRecordDto;
 import com.xjrsoft.module.attendance.dto.TeacherDetailsDto;
 import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
 import com.xjrsoft.module.attendance.vo.TeacherStatisticsPageVo;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

src/main/java/com/xjrsoft/module/attendance/service/impl/AttendanceRuleCategoryServiceImpl.java

@@ -22,7 +22,6 @@ import com.xjrsoft.module.attendance.service.IAttendanceRuleCategoryService;
 import com.xjrsoft.module.attendance.vo.AttendanceRuleDetailsUserVo;
 import com.xjrsoft.module.attendance.vo.TimeRangeVo;
 import com.xjrsoft.module.concat.service.IXjrUserService;
-import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.student.entity.BaseStudent;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;

src/main/java/com/xjrsoft/module/attendance/service/impl/AttendanceStatisticsRecordServiceImpl.java

@@ -1,49 +1,11 @@
 package com.xjrsoft.module.attendance.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.xjrsoft.common.exception.MyException;
-import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.attendance.dto.AddAttendanceStatisticsDto;
-import com.xjrsoft.module.attendance.dto.AttendanceStatisticsPageDto;
-import com.xjrsoft.module.attendance.dto.AttendanceStatisticsRecordDto;
-import com.xjrsoft.module.attendance.entity.AttendanceRuleDetails;
-import com.xjrsoft.module.attendance.entity.AttendanceStatistics;
 import com.xjrsoft.module.attendance.entity.AttendanceStatisticsRecord;
-import com.xjrsoft.module.attendance.entity.AttendanceUserRelation;
-import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
-import com.xjrsoft.module.attendance.mapper.AttendanceStatisticsMapper;
 import com.xjrsoft.module.attendance.mapper.AttendanceStatisticsRecordMapper;
-import com.xjrsoft.module.attendance.service.IAttendanceRuleCategoryService;
 import com.xjrsoft.module.attendance.service.IAttendanceStatisticsRecordService;
-import com.xjrsoft.module.attendance.service.IAttendanceStatisticsService;
-import com.xjrsoft.module.attendance.service.ITeacherAttendanceRecordService;
-import com.xjrsoft.module.attendance.vo.AttendanceStatisticsPageVo;
-import com.xjrsoft.module.attendance.vo.AttendanceStatisticsRecordVo;
-import com.xjrsoft.module.organization.entity.User;
-import com.xjrsoft.module.organization.service.IUserService;
 import lombok.AllArgsConstructor;
-import me.zhyd.oauth.log.Log;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.IOException;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
 * @title: 考勤统计

src/main/java/com/xjrsoft/module/attendance/service/impl/AttendanceStatisticsServiceImpl.java

@@ -288,6 +288,9 @@ public class AttendanceStatisticsServiceImpl extends MPJBaseServiceImpl<Attendan
             for (User user : userList) {
                 AttendanceStatisticsRecord record = new AttendanceStatisticsRecord();
                 record.setUserId(user.getId());
+                if(14954799879750L == user.getId()){
+                    System.out.println(user.getName());
+                }
                 record.setAttendanceStatisticsId(statistics.getId());
                 Long normalCount = 0L;
                 Long leaveCount = 0L;

src/main/java/com/xjrsoft/module/attendance/service/impl/TeacherAttendanceRecordServiceImpl.java

@@ -3,7 +3,6 @@ package com.xjrsoft.module.attendance.service.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.exception.MyException;
-import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.module.attendance.dto.ResetTeacherAttendanceRecordDto;
 import com.xjrsoft.module.attendance.dto.TeacherDetailsDto;
 import com.xjrsoft.module.attendance.entity.TeacherAttendanceRecord;
@@ -23,7 +22,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/module/attendance/vo/AttendanceRuleCategoryListVo.java

@@ -3,8 +3,6 @@ package com.xjrsoft.module.attendance.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
 * @title: 考勤规则list列表出参
 * @Author dzx

src/main/java/com/xjrsoft/module/attendance/vo/AttendanceStatisticsVo.java

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

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskClassStudentServiceImpl.java

@@ -2,7 +2,6 @@ package com.xjrsoft.module.banding.service.impl;
 
 import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskServiceImpl.java

@@ -43,7 +43,6 @@ import com.xjrsoft.module.base.mapper.BaseMajorSetMapper;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.base.service.IBaseGradeService;
 import com.xjrsoft.module.organization.entity.User;
-import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import com.xjrsoft.module.organization.service.IUserRoleRelationService;
 import com.xjrsoft.module.organization.service.IUserService;

src/main/java/com/xjrsoft/module/base/controller/BaseClassDynamicsController.java

@@ -6,7 +6,6 @@ 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.enums.RoleEnum;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;

src/main/java/com/xjrsoft/module/base/controller/CourseSubjectDetailController.java

@@ -1,41 +1,40 @@
 package com.xjrsoft.module.base.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.dto.AddCourseSubjectDetailDto;
-import com.xjrsoft.module.base.dto.UpdateCourseSubjectDetailDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.alibaba.excel.EasyExcel;
-import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
-import com.alibaba.excel.support.ExcelTypeEnum;
-import org.springframework.http.ResponseEntity;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-
 import com.xjrsoft.module.base.dto.CourseSubjectDetailPageDto;
+import com.xjrsoft.module.base.dto.UpdateCourseSubjectDetailDto;
 import com.xjrsoft.module.base.entity.CourseSubjectDetail;
 import com.xjrsoft.module.base.service.ICourseSubjectDetailService;
 import com.xjrsoft.module.base.vo.CourseSubjectDetailPageVo;
-
 import com.xjrsoft.module.base.vo.CourseSubjectDetailVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.http.ResponseEntity;
+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 org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/module/base/controller/OdsZzxxgkjcsjController.java

@@ -0,0 +1,121 @@
+package com.xjrsoft.module.base.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.dto.AddOdsZzxxgkjcsjDto;
+import com.xjrsoft.module.base.dto.OdsZzxxgkjcsjListDto;
+import com.xjrsoft.module.base.dto.UpdateOdsZzxxgkjcsjDto;
+import com.xjrsoft.module.base.entity.OdsZzxxgkjcsj;
+import com.xjrsoft.module.base.service.IOdsZzxxgkjcsjService;
+import com.xjrsoft.module.base.vo.OdsZzxxgkjcsjListVo;
+import com.xjrsoft.module.base.vo.OdsZzxxgkjcsjVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
+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 org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+/**
+* @title: 学校基本数据子类表
+* @Author dzx
+* @Date: 2024-12-12
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/base" + "/odsZzxxgkjcsj")
+@Api(value = "/base"  + "/odsZzxxgkjcsj",tags = "学校基本数据子类表代码")
+@AllArgsConstructor
+public class OdsZzxxgkjcsjController {
+
+
+    private final IOdsZzxxgkjcsjService odsZzxxgkjcsjService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="学校基本数据子类表列表(不分页)")
+    @SaCheckPermission("odszzxxgkjcsj:detail")
+    public RT<List<OdsZzxxgkjcsjListVo>> list(@Valid OdsZzxxgkjcsjListDto dto){
+
+        LambdaQueryWrapper<OdsZzxxgkjcsj> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(OdsZzxxgkjcsj::getId)
+                    .select(OdsZzxxgkjcsj.class,x -> VoToColumnUtil.fieldsToColumns(OdsZzxxgkjcsjListVo.class).contains(x.getProperty()));
+
+        List<OdsZzxxgkjcsj> list = odsZzxxgkjcsjService.list(queryWrapper);
+        List<OdsZzxxgkjcsjListVo> listVos = BeanUtil.copyToList(list, OdsZzxxgkjcsjListVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询学校基本数据子类表信息")
+    @SaCheckPermission("odszzxxgkjcsj:detail")
+    public RT<OdsZzxxgkjcsjVo> info(@RequestParam Long id){
+        OdsZzxxgkjcsj odsZzxxgkjcsj = odsZzxxgkjcsjService.getById(id);
+        if (odsZzxxgkjcsj == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(odsZzxxgkjcsj, OdsZzxxgkjcsjVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增学校基本数据子类表")
+    @SaCheckPermission("odszzxxgkjcsj:add")
+    public RT<Boolean> add(@Valid @RequestBody AddOdsZzxxgkjcsjDto dto){
+        OdsZzxxgkjcsj odsZzxxgkjcsj = BeanUtil.toBean(dto, OdsZzxxgkjcsj.class);
+        boolean isSuccess = odsZzxxgkjcsjService.save(odsZzxxgkjcsj);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改学校基本数据子类表")
+    @SaCheckPermission("odszzxxgkjcsj:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateOdsZzxxgkjcsjDto dto){
+
+        OdsZzxxgkjcsj odsZzxxgkjcsj = BeanUtil.toBean(dto, OdsZzxxgkjcsj.class);
+        return RT.ok(odsZzxxgkjcsjService.updateById(odsZzxxgkjcsj));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除学校基本数据子类表")
+    @SaCheckPermission("odszzxxgkjcsj:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(odsZzxxgkjcsjService.removeBatchByIds(ids));
+
+    }
+    @PostMapping("/import")
+    @ApiOperation(value = "导入")
+    public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
+        List<OdsZzxxgkjcsjListVo> savedDataList = EasyExcel.read(file.getInputStream()).head(OdsZzxxgkjcsjListVo.class).sheet().doReadSync();
+        Boolean result = odsZzxxgkjcsjService.saveBatch(BeanUtil.copyToList(savedDataList, OdsZzxxgkjcsj.class));
+        return RT.ok(result);
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid OdsZzxxgkjcsjListDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<OdsZzxxgkjcsjListVo> customerList = (List<OdsZzxxgkjcsjListVo>) list(dto).getData();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, OdsZzxxgkjcsjListVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "OdsZzxxgkjcsj" + ExcelTypeEnum.XLSX.getValue());
+    }
+}

src/main/java/com/xjrsoft/module/base/dto/AddCourseSubjectDetailDto.java

@@ -2,14 +2,8 @@ package com.xjrsoft.module.base.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

src/main/java/com/xjrsoft/module/base/dto/AddOdsZzxxgkjcsjDto.java

@@ -0,0 +1,103 @@
+package com.xjrsoft.module.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+* @title: 学校基本数据子类表
+* @Author dzx
+* @Date: 2024-12-12
+* @Version 1.0
+*/
+@Data
+public class AddOdsZzxxgkjcsjDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 学校名称
+    */
+    @ApiModelProperty("学校名称")
+    private String schoolName;
+    /**
+    * 学校代码
+    */
+    @ApiModelProperty("学校代码")
+    private String schoolCode;
+    /**
+    * 学校机构代码
+    */
+    @ApiModelProperty("学校机构代码")
+    private String schoolInstitutionCode;
+    /**
+    * 学校类别
+    */
+    @ApiModelProperty("学校类别")
+    private String schoolType;
+    /**
+    * 学校举办者名称
+    */
+    @ApiModelProperty("学校举办者名称")
+    private String organizerName;
+    /**
+    * 学校举办者性质
+    */
+    @ApiModelProperty("学校举办者性质")
+    private String schoolOrganizerNature;
+    /**
+    * 学校负责人姓名
+    */
+    @ApiModelProperty("学校负责人姓名")
+    private String superintendent;
+    /**
+    * 建校年月
+    */
+    @ApiModelProperty("建校年月")
+    private Date establishDate;
+    /**
+    * 学校所在地行政区域
+    */
+    @ApiModelProperty("学校所在地行政区域")
+    private String location;
+    /**
+    * 学校主管部门
+    */
+    @ApiModelProperty("学校主管部门")
+    private String supervisoryDepartment;
+    /**
+    * 学校园出口带宽
+    */
+    @ApiModelProperty("学校园出口带宽")
+    private String exitBandwidth;
+    /**
+    * 校园主干网带宽
+    */
+    @ApiModelProperty("校园主干网带宽")
+    private String backboneBandwidth;
+    /**
+    * 有线网络接入数
+    */
+    @ApiModelProperty("有线网络接入数")
+    private Integer wiredAccess;
+    /**
+    * 无线网络接入数
+    */
+    @ApiModelProperty("无线网络接入数")
+    private Integer wirelessAccess;
+    /**
+    * 多媒体教室数
+    */
+    @ApiModelProperty("多媒体教室数")
+    private Integer multimediaClassrooms;
+    /**
+    * 是否双优学校
+    */
+    @ApiModelProperty("是否双优学校")
+    private String isDoubleExcellence;
+
+}

src/main/java/com/xjrsoft/module/base/dto/CourseSubjectDetailPageDto.java

@@ -1,15 +1,8 @@
 package com.xjrsoft.module.base.dto;
 
 import com.xjrsoft.common.page.PageInput;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/base/dto/OdsZzxxgkjcsjListDto.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.base.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 学校基本数据子类表列表查询入参
+* @Author dzx
+* @Date: 2024-12-12
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OdsZzxxgkjcsjListDto extends ListInput {
+
+
+}

src/main/java/com/xjrsoft/module/base/dto/OdsZzxxgkjcsjPageDto.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.base.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 学校基本数据子类表分页查询入参
+* @Author dzx
+* @Date: 2024-12-12
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OdsZzxxgkjcsjPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/base/dto/UpdateCourseSubjectDetailDto.java

@@ -2,14 +2,6 @@ package com.xjrsoft.module.base.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

src/main/java/com/xjrsoft/module/base/dto/UpdateOdsZzxxgkjcsjDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 学校基本数据子类表
+* @Author dzx
+* @Date: 2024-12-12
+* @Version 1.0
+*/
+@Data
+public class UpdateOdsZzxxgkjcsjDto extends AddOdsZzxxgkjcsjDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/base/entity/BaseCourseSubject.java

@@ -1,6 +1,10 @@
 package com.xjrsoft.module.base.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+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;

src/main/java/com/xjrsoft/module/base/entity/CourseSubjectDetail.java

@@ -2,18 +2,14 @@ package com.xjrsoft.module.base.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 com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

src/main/java/com/xjrsoft/module/base/entity/OdsZzxxgkjcsj.java

@@ -0,0 +1,154 @@
+package com.xjrsoft.module.base.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-12-12
+* @Version 1.0
+*/
+@Data
+@TableName("ods_zzxxgkjcsj")
+@ApiModel(value = "ods_zzxxgkjcsj", description = "学校基本数据子类表")
+public class OdsZzxxgkjcsj 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 schoolName;
+    /**
+    * 学校代码
+    */
+    @ApiModelProperty("学校代码")
+    private String schoolCode;
+    /**
+    * 学校机构代码
+    */
+    @ApiModelProperty("学校机构代码")
+    private String schoolInstitutionCode;
+    /**
+    * 学校类别
+    */
+    @ApiModelProperty("学校类别")
+    private String schoolType;
+    /**
+    * 学校举办者名称
+    */
+    @ApiModelProperty("学校举办者名称")
+    private String organizerName;
+    /**
+    * 学校举办者性质
+    */
+    @ApiModelProperty("学校举办者性质")
+    private String schoolOrganizerNature;
+    /**
+    * 学校负责人姓名
+    */
+    @ApiModelProperty("学校负责人姓名")
+    private String superintendent;
+    /**
+    * 建校年月
+    */
+    @ApiModelProperty("建校年月")
+    private Date establishDate;
+    /**
+    * 学校所在地行政区域
+    */
+    @ApiModelProperty("学校所在地行政区域")
+    private String location;
+    /**
+    * 学校主管部门
+    */
+    @ApiModelProperty("学校主管部门")
+    private String supervisoryDepartment;
+    /**
+    * 学校园出口带宽
+    */
+    @ApiModelProperty("学校园出口带宽")
+    private String exitBandwidth;
+    /**
+    * 校园主干网带宽
+    */
+    @ApiModelProperty("校园主干网带宽")
+    private String backboneBandwidth;
+    /**
+    * 有线网络接入数
+    */
+    @ApiModelProperty("有线网络接入数")
+    private Integer wiredAccess;
+    /**
+    * 无线网络接入数
+    */
+    @ApiModelProperty("无线网络接入数")
+    private Integer wirelessAccess;
+    /**
+    * 多媒体教室数
+    */
+    @ApiModelProperty("多媒体教室数")
+    private Integer multimediaClassrooms;
+    /**
+    * 是否双优学校
+    */
+    @ApiModelProperty("是否双优学校")
+    private String isDoubleExcellence;
+
+
+}

src/main/java/com/xjrsoft/module/base/mapper/CourseSubjectDetailMapper.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.base.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.base.entity.CourseSubjectDetail;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/xjrsoft/module/base/mapper/OdsZzxxgkjcsjMapper.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.base.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.base.entity.OdsZzxxgkjcsj;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 学校基本数据子类表
+* @Author dzx
+* @Date: 2024-12-12
+* @Version 1.0
+*/
+@Mapper
+public interface OdsZzxxgkjcsjMapper extends MPJBaseMapper<OdsZzxxgkjcsj> {
+
+}

src/main/java/com/xjrsoft/module/base/service/ICourseSubjectDetailService.java

@@ -1,10 +1,7 @@
 package com.xjrsoft.module.base.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.base.entity.CourseSubjectDetail;
-import lombok.Data;
-import java.util.List;
 
 /**
 * @title: 课程学科管理详情表

src/main/java/com/xjrsoft/module/base/service/IOdsZzxxgkjcsjService.java

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.base.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.base.entity.OdsZzxxgkjcsj;
+
+/**
+* @title: 学校基本数据子类表
+* @Author dzx
+* @Date: 2024-12-12
+* @Version 1.0
+*/
+
+public interface IOdsZzxxgkjcsjService extends MPJBaseService<OdsZzxxgkjcsj> {
+}

src/main/java/com/xjrsoft/module/base/service/impl/BaseClassCourseServiceImpl.java

@@ -87,6 +87,10 @@ public class BaseClassCourseServiceImpl extends MPJBaseServiceImpl<BaseClassCour
 
         isSuccess = this.saveBatch(baseClassCourseList);
 
+
+        // 课程教材添加成功，添加领取状态
+
+
         return isSuccess;
         //baseClassCourseMapper.updateAddClassCourseTextbooks(classId, courseId, textbookId);
     }

src/main/java/com/xjrsoft/module/base/service/impl/CourseSubjectDetailServiceImpl.java

@@ -1,17 +1,11 @@
 package com.xjrsoft.module.base.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.base.entity.CourseSubjectDetail;
 import com.xjrsoft.module.base.mapper.CourseSubjectDetailMapper;
 import com.xjrsoft.module.base.service.ICourseSubjectDetailService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 /**
 * @title: 课程学科管理详情表

src/main/java/com/xjrsoft/module/base/service/impl/OdsZzxxgkjcsjServiceImpl.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.base.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.base.entity.OdsZzxxgkjcsj;
+import com.xjrsoft.module.base.mapper.OdsZzxxgkjcsjMapper;
+import com.xjrsoft.module.base.service.IOdsZzxxgkjcsjService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 学校基本数据子类表
+* @Author dzx
+* @Date: 2024-12-12
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class OdsZzxxgkjcsjServiceImpl extends MPJBaseServiceImpl<OdsZzxxgkjcsjMapper, OdsZzxxgkjcsj> implements IOdsZzxxgkjcsjService {
+}

src/main/java/com/xjrsoft/module/base/vo/CourseSubjectDetailPageVo.java

@@ -1,17 +1,10 @@
 package com.xjrsoft.module.base.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

src/main/java/com/xjrsoft/module/base/vo/CourseSubjectDetailVo.java

@@ -3,12 +3,6 @@ package com.xjrsoft.module.base.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: 课程学科管理详情表表单出参
 * @Author dzx

src/main/java/com/xjrsoft/module/base/vo/OdsZzxxgkjcsjListVo.java

@@ -0,0 +1,181 @@
+package com.xjrsoft.module.base.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 学校基本数据子类表列表列表入参
+* @Author dzx
+* @Date: 2024-12-12
+* @Version 1.0
+*/
+@Data
+public class OdsZzxxgkjcsjListVo {
+
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建人")
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改人")
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改日期")
+    @ApiModelProperty("修改日期")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("删除标记")
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有效标记")
+    @ApiModelProperty("有效标记")
+    private Integer enabledMark;
+    /**
+    * 学校名称
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校名称")
+    @ApiModelProperty("学校名称")
+    private String schoolName;
+    /**
+    * 学校代码
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校代码")
+    @ApiModelProperty("学校代码")
+    private String schoolCode;
+    /**
+    * 学校机构代码
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校机构代码")
+    @ApiModelProperty("学校机构代码")
+    private String schoolInstitutionCode;
+    /**
+    * 学校类别
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校类别")
+    @ApiModelProperty("学校类别")
+    private String schoolType;
+    /**
+    * 学校举办者名称
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校举办者名称")
+    @ApiModelProperty("学校举办者名称")
+    private String organizerName;
+    /**
+    * 学校举办者性质
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校举办者性质")
+    @ApiModelProperty("学校举办者性质")
+    private String schoolOrganizerNature;
+    /**
+    * 学校负责人姓名
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校负责人姓名")
+    @ApiModelProperty("学校负责人姓名")
+    private String superintendent;
+    /**
+    * 建校年月
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("建校年月")
+    @ApiModelProperty("建校年月")
+    private Date establishDate;
+    /**
+    * 学校所在地行政区域
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校所在地行政区域")
+    @ApiModelProperty("学校所在地行政区域")
+    private String location;
+    /**
+    * 学校主管部门
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校主管部门")
+    @ApiModelProperty("学校主管部门")
+    private String supervisoryDepartment;
+    /**
+    * 学校园出口带宽
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校园出口带宽")
+    @ApiModelProperty("学校园出口带宽")
+    private String exitBandwidth;
+    /**
+    * 校园主干网带宽
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("校园主干网带宽")
+    @ApiModelProperty("校园主干网带宽")
+    private String backboneBandwidth;
+    /**
+    * 有线网络接入数
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有线网络接入数")
+    @ApiModelProperty("有线网络接入数")
+    private Integer wiredAccess;
+    /**
+    * 无线网络接入数
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("无线网络接入数")
+    @ApiModelProperty("无线网络接入数")
+    private Integer wirelessAccess;
+    /**
+    * 多媒体教室数
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("多媒体教室数")
+    @ApiModelProperty("多媒体教室数")
+    private Integer multimediaClassrooms;
+    /**
+    * 是否双优学校
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("是否双优学校")
+    @ApiModelProperty("是否双优学校")
+    private String isDoubleExcellence;
+
+}

src/main/java/com/xjrsoft/module/base/vo/OdsZzxxgkjcsjPageVo.java

@@ -0,0 +1,181 @@
+package com.xjrsoft.module.base.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 学校基本数据子类表分页列表出参
+* @Author dzx
+* @Date: 2024-12-12
+* @Version 1.0
+*/
+@Data
+public class OdsZzxxgkjcsjPageVo {
+
+    /**
+    * 
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("")
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建人")
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改人")
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改日期")
+    @ApiModelProperty("修改日期")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("删除标记")
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有效标记")
+    @ApiModelProperty("有效标记")
+    private Integer enabledMark;
+    /**
+    * 学校名称
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校名称")
+    @ApiModelProperty("学校名称")
+    private String schoolName;
+    /**
+    * 学校代码
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校代码")
+    @ApiModelProperty("学校代码")
+    private String schoolCode;
+    /**
+    * 学校机构代码
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校机构代码")
+    @ApiModelProperty("学校机构代码")
+    private String schoolInstitutionCode;
+    /**
+    * 学校类别
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校类别")
+    @ApiModelProperty("学校类别")
+    private String schoolType;
+    /**
+    * 学校举办者名称
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校举办者名称")
+    @ApiModelProperty("学校举办者名称")
+    private String organizerName;
+    /**
+    * 学校举办者性质
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校举办者性质")
+    @ApiModelProperty("学校举办者性质")
+    private String schoolOrganizerNature;
+    /**
+    * 学校负责人姓名
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校负责人姓名")
+    @ApiModelProperty("学校负责人姓名")
+    private String superintendent;
+    /**
+    * 建校年月
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("建校年月")
+    @ApiModelProperty("建校年月")
+    private Date establishDate;
+    /**
+    * 学校所在地行政区域
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校所在地行政区域")
+    @ApiModelProperty("学校所在地行政区域")
+    private String location;
+    /**
+    * 学校主管部门
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校主管部门")
+    @ApiModelProperty("学校主管部门")
+    private String supervisoryDepartment;
+    /**
+    * 学校园出口带宽
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学校园出口带宽")
+    @ApiModelProperty("学校园出口带宽")
+    private String exitBandwidth;
+    /**
+    * 校园主干网带宽
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("校园主干网带宽")
+    @ApiModelProperty("校园主干网带宽")
+    private String backboneBandwidth;
+    /**
+    * 有线网络接入数
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有线网络接入数")
+    @ApiModelProperty("有线网络接入数")
+    private Integer wiredAccess;
+    /**
+    * 无线网络接入数
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("无线网络接入数")
+    @ApiModelProperty("无线网络接入数")
+    private Integer wirelessAccess;
+    /**
+    * 多媒体教室数
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("多媒体教室数")
+    @ApiModelProperty("多媒体教室数")
+    private Integer multimediaClassrooms;
+    /**
+    * 是否双优学校
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("是否双优学校")
+    @ApiModelProperty("是否双优学校")
+    private String isDoubleExcellence;
+
+}

src/main/java/com/xjrsoft/module/base/vo/OdsZzxxgkjcsjVo.java

@@ -0,0 +1,105 @@
+package com.xjrsoft.module.base.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 学校基本数据子类表表单出参
+* @Author dzx
+* @Date: 2024-12-12
+* @Version 1.0
+*/
+@Data
+public class OdsZzxxgkjcsjVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 学校名称
+    */
+    @ApiModelProperty("学校名称")
+    private String schoolName;
+    /**
+    * 学校代码
+    */
+    @ApiModelProperty("学校代码")
+    private String schoolCode;
+    /**
+    * 学校机构代码
+    */
+    @ApiModelProperty("学校机构代码")
+    private String schoolInstitutionCode;
+    /**
+    * 学校类别
+    */
+    @ApiModelProperty("学校类别")
+    private String schoolType;
+    /**
+    * 学校举办者名称
+    */
+    @ApiModelProperty("学校举办者名称")
+    private String organizerName;
+    /**
+    * 学校举办者性质
+    */
+    @ApiModelProperty("学校举办者性质")
+    private String schoolOrganizerNature;
+    /**
+    * 学校负责人姓名
+    */
+    @ApiModelProperty("学校负责人姓名")
+    private String superintendent;
+    /**
+    * 建校年月
+    */
+    @ApiModelProperty("建校年月")
+    private Date establishDate;
+    /**
+    * 学校所在地行政区域
+    */
+    @ApiModelProperty("学校所在地行政区域")
+    private String location;
+    /**
+    * 学校主管部门
+    */
+    @ApiModelProperty("学校主管部门")
+    private String supervisoryDepartment;
+    /**
+    * 学校园出口带宽
+    */
+    @ApiModelProperty("学校园出口带宽")
+    private String exitBandwidth;
+    /**
+    * 校园主干网带宽
+    */
+    @ApiModelProperty("校园主干网带宽")
+    private String backboneBandwidth;
+    /**
+    * 有线网络接入数
+    */
+    @ApiModelProperty("有线网络接入数")
+    private Integer wiredAccess;
+    /**
+    * 无线网络接入数
+    */
+    @ApiModelProperty("无线网络接入数")
+    private Integer wirelessAccess;
+    /**
+    * 多媒体教室数
+    */
+    @ApiModelProperty("多媒体教室数")
+    private Integer multimediaClassrooms;
+    /**
+    * 是否双优学校
+    */
+    @ApiModelProperty("是否双优学校")
+    private String isDoubleExcellence;
+
+
+
+}

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

@@ -2,7 +2,6 @@ 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;
 
 /**

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

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.classtime.mapper;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.classtime.dto.CourseRecordDto;
 import com.xjrsoft.module.classtime.entity.ClassTimeStatistics;

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

@@ -5,7 +5,6 @@ import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.classtime.dto.ClassTimeDeletePageDto;
 import com.xjrsoft.module.classtime.entity.ClassTimeDelete;
 import com.xjrsoft.module.classtime.vo.ClassTimeDeletePageVo;
-import org.apache.ibatis.annotations.Param;
 
 /**
 * @title: 课时删除

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

@@ -17,7 +17,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 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;
@@ -74,14 +73,12 @@ import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 

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

@@ -21,14 +21,11 @@ import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFColor;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
 
-import java.awt.*;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 

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

@@ -3,8 +3,6 @@ package com.xjrsoft.module.classtime.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
 * @title: 课时统计-教师详情表单出参
 * @Author dzx

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

@@ -3,7 +3,6 @@ package com.xjrsoft.module.classtime.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/module/courseTable/controller/SecondCourseController.java

@@ -17,7 +17,6 @@ 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.courseTable.dto.UserEnrollDto;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.concat.service.IXjrUserService;
@@ -25,6 +24,7 @@ import com.xjrsoft.module.courseTable.dto.AddSecondCourseDto;
 import com.xjrsoft.module.courseTable.dto.SecondCourseEnrollPageDto;
 import com.xjrsoft.module.courseTable.dto.SecondCoursePageDto;
 import com.xjrsoft.module.courseTable.dto.UpdateSecondCourseDto;
+import com.xjrsoft.module.courseTable.dto.UserEnrollDto;
 import com.xjrsoft.module.courseTable.entity.SecondCourse;
 import com.xjrsoft.module.courseTable.service.ISecondCourseService;
 import com.xjrsoft.module.courseTable.vo.SecondCourseEnrollExcelVo;

src/main/java/com/xjrsoft/module/courseTable/dto/AddClassTimeDto.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 
 /**

src/main/java/com/xjrsoft/module/courseTable/dto/AddSecondCourseTimeDto.java

@@ -4,9 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Date;
 
 
 

src/main/java/com/xjrsoft/module/courseTable/mapper/CourseTableMapper.java

@@ -2,13 +2,13 @@ package com.xjrsoft.module.courseTable.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.courseTable.dto.ClassTeacherDto;
+import com.xjrsoft.module.courseTable.entity.CourseTable;
 import com.xjrsoft.module.courseTable.vo.ClassTeacherVo;
 import com.xjrsoft.module.schedule.dto.ClassOptionDto;
-import com.xjrsoft.module.courseTable.entity.CourseTable;
-import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
-import com.xjrsoft.module.schedule.vo.ClassOptionVo;
 import com.xjrsoft.module.schedule.dto.CourseTableAdjustDto;
 import com.xjrsoft.module.schedule.dto.CourseTableDto;
+import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
+import com.xjrsoft.module.schedule.vo.ClassOptionVo;
 import com.xjrsoft.module.schedule.vo.CourseDetailVo;
 import com.xjrsoft.module.schedule.vo.CourseListVo;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/xjrsoft/module/courseTable/service/ICourseTableService.java

@@ -12,7 +12,6 @@ import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
 import com.xjrsoft.module.schedule.vo.ClassOptionVo;
 import com.xjrsoft.module.schedule.vo.CourseListVo;
 import com.xjrsoft.module.schedule.vo.CourseTableVo;
-import org.apache.ibatis.annotations.Param;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

src/main/java/com/xjrsoft/module/courseTable/service/ISecondCourseService.java

@@ -2,11 +2,11 @@ package com.xjrsoft.module.courseTable.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.courseTable.dto.UserEnrollDto;
 import com.xjrsoft.module.courseTable.dto.AddSecondCourseDto;
 import com.xjrsoft.module.courseTable.dto.SecondCourseEnrollPageDto;
 import com.xjrsoft.module.courseTable.dto.SecondCoursePageDto;
 import com.xjrsoft.module.courseTable.dto.UpdateSecondCourseDto;
+import com.xjrsoft.module.courseTable.dto.UserEnrollDto;
 import com.xjrsoft.module.courseTable.entity.SecondCourse;
 import com.xjrsoft.module.courseTable.vo.SecondCourseEnrollVo;
 import com.xjrsoft.module.courseTable.vo.SecondCoursePageVo;

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -66,7 +66,6 @@ import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.service.ITeacherbaseManagerService;
 import lombok.AllArgsConstructor;
 import me.zhyd.oauth.log.Log;
-import org.apache.ibatis.annotations.Param;
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;

src/main/java/com/xjrsoft/module/courseTable/service/impl/SecondCourseServiceImpl.java

@@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.module.concat.service.IXjrUserService;
-import com.xjrsoft.module.courseTable.dto.UserEnrollDto;
 import com.xjrsoft.module.courseTable.dto.AddSecondCourseDto;
 import com.xjrsoft.module.courseTable.dto.SecondCourseEnrollPageDto;
 import com.xjrsoft.module.courseTable.dto.SecondCoursePageDto;
 import com.xjrsoft.module.courseTable.dto.UpdateSecondCourseDto;
+import com.xjrsoft.module.courseTable.dto.UserEnrollDto;
 import com.xjrsoft.module.courseTable.entity.SecondCourse;
 import com.xjrsoft.module.courseTable.entity.SecondCourseEnroll;
 import com.xjrsoft.module.courseTable.entity.SecondCourseEnrollRange;

src/main/java/com/xjrsoft/module/courseTable/vo/ClassTimePageVo.java

@@ -1,12 +1,8 @@
 package com.xjrsoft.module.courseTable.vo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 /**
 * @title: 第二课堂分页列表出参
 * @Author dzx

src/main/java/com/xjrsoft/module/courseTable/vo/ClassTimeVo.java

@@ -1,7 +1,5 @@
 package com.xjrsoft.module.courseTable.vo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/xjrsoft/module/courseTable/vo/SecondCoursePageVo.java

@@ -3,8 +3,6 @@ package com.xjrsoft.module.courseTable.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
 * @title: 第二课堂分页列表出参
 * @Author dzx

src/main/java/com/xjrsoft/module/courseTable/vo/SecondCourseTimeVo.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalTime;
-import java.util.Date;
 
 /**
 * @title: 第二课堂开课时间表单出参

src/main/java/com/xjrsoft/module/databoard/dto/StatisticsDetailDto.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.databoard.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/xjrsoft/module/databoard/vo/RepairStatisticsVo.java

@@ -3,8 +3,6 @@ package com.xjrsoft.module.databoard.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
 * @title: 数据看板-维修申报统计出参
 * @Author dzx

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateResultController.java

@@ -9,7 +9,6 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDetailDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateResultIndexPageDto;
-import com.xjrsoft.module.evaluate.dto.ResultViewingExcelDto;
 import com.xjrsoft.module.evaluate.dto.ResultViewingPageDto;
 import com.xjrsoft.module.evaluate.service.IEvaluateResultService;
 import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageDetailVo;

src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateObjectMapper.java

@@ -4,7 +4,6 @@ import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.evaluate.dto.EvaluateObjectListDto;
 import com.xjrsoft.module.evaluate.dto.ObjectGradeDeleteDto;
 import com.xjrsoft.module.evaluate.dto.SaveEvaluateObjectDto;
-import com.xjrsoft.module.evaluate.entity.EvaluateManage;
 import com.xjrsoft.module.evaluate.entity.EvaluateObject;
 import com.xjrsoft.module.evaluate.vo.ClassTeachersListVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateExecuterVo;

src/main/java/com/xjrsoft/module/evaluate/service/IEvaluateResultService.java

@@ -6,14 +6,12 @@ import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDetailDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateResultDetailPageDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateResultIndexPageDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateResultSaveDto;
-import com.xjrsoft.module.evaluate.dto.ResultViewingExcelDto;
 import com.xjrsoft.module.evaluate.dto.ResultViewingPageDto;
 import com.xjrsoft.module.evaluate.entity.EvaluateResult;
 import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageDetailVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateResultIndexPageVo;
 import com.xjrsoft.module.evaluate.vo.ResultViewingPageVo;
-import org.springframework.http.ResponseEntity;
 
 import java.util.List;
 

src/main/java/com/xjrsoft/module/form/controller/FormExecuteController.java

@@ -14,7 +14,17 @@ import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.common.utils.DatasourceUtil;
 import com.xjrsoft.common.utils.LocalDateTimeUtil;
 import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto;
-import com.xjrsoft.module.form.dto.*;
+import com.xjrsoft.module.form.dto.AppFormExecuteAddOrUpdateDto;
+import com.xjrsoft.module.form.dto.AppFormExecuteDeleteDto;
+import com.xjrsoft.module.form.dto.AppFormExecuteInfoDto;
+import com.xjrsoft.module.form.dto.AppFormExecuteListDto;
+import com.xjrsoft.module.form.dto.AppFormExecutePageDto;
+import com.xjrsoft.module.form.dto.FormExecuteAddOrUpdateDto;
+import com.xjrsoft.module.form.dto.FormExecuteDeleteDto;
+import com.xjrsoft.module.form.dto.FormExecuteInfoDto;
+import com.xjrsoft.module.form.dto.FormExecuteListDto;
+import com.xjrsoft.module.form.dto.FormExecutePageDto;
+import com.xjrsoft.module.form.dto.FormExecuteWorkflowInfoDto;
 import com.xjrsoft.module.form.entity.FormDesignConfig;
 import com.xjrsoft.module.form.entity.FormRelease;
 import com.xjrsoft.module.form.entity.FormReleaseConfig;
@@ -32,11 +42,25 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import oracle.sql.INTERVALDS;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+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 org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
@@ -51,7 +75,12 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/xjrsoft/module/form/service/IFormExecuteService.java

@@ -18,11 +18,7 @@ import com.xjrsoft.module.form.dto.FormExecuteWorkflowInfoDto;
 import com.xjrsoft.module.form.dto.FormExecuteWorkflowUpdateDto;
 import com.xjrsoft.module.form.vo.DeskTableInfoVo;
 import org.apache.commons.lang3.tuple.Triple;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
 
-import javax.validation.Valid;
-import java.io.ByteArrayOutputStream;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/xjrsoft/module/form/service/impl/FormExecuteServiceImpl.java

@@ -6,7 +6,12 @@ import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.db.*;
+import cn.hutool.db.Db;
+import cn.hutool.db.Entity;
+import cn.hutool.db.GlobalDbConfig;
+import cn.hutool.db.Page;
+import cn.hutool.db.PageResult;
+import cn.hutool.db.Session;
 import cn.hutool.db.meta.Column;
 import cn.hutool.db.meta.JdbcType;
 import cn.hutool.db.meta.MetaUtil;
@@ -32,7 +37,19 @@ import com.xjrsoft.common.utils.LocalDateTimeUtil;
 import com.xjrsoft.module.app.entity.AppFuncDesign;
 import com.xjrsoft.module.app.service.IAppFuncDesignService;
 import com.xjrsoft.module.authority.utils.AuthorityUtil;
-import com.xjrsoft.module.form.dto.*;
+import com.xjrsoft.module.form.dto.AppFormExecuteAddOrUpdateDto;
+import com.xjrsoft.module.form.dto.AppFormExecuteDeleteDto;
+import com.xjrsoft.module.form.dto.AppFormExecuteInfoDto;
+import com.xjrsoft.module.form.dto.AppFormExecuteListDto;
+import com.xjrsoft.module.form.dto.AppFormExecutePageDto;
+import com.xjrsoft.module.form.dto.FormExecuteAddOrUpdateDto;
+import com.xjrsoft.module.form.dto.FormExecuteDeleteDto;
+import com.xjrsoft.module.form.dto.FormExecuteInfoDto;
+import com.xjrsoft.module.form.dto.FormExecuteListDto;
+import com.xjrsoft.module.form.dto.FormExecutePageDto;
+import com.xjrsoft.module.form.dto.FormExecuteWorkflowAddDto;
+import com.xjrsoft.module.form.dto.FormExecuteWorkflowInfoDto;
+import com.xjrsoft.module.form.dto.FormExecuteWorkflowUpdateDto;
 import com.xjrsoft.module.form.entity.FormDesignConfig;
 import com.xjrsoft.module.form.entity.FormRelease;
 import com.xjrsoft.module.form.entity.FormReleaseConfig;
@@ -45,7 +62,12 @@ import com.xjrsoft.module.form.utils.FormDataTransUtil;
 import com.xjrsoft.module.form.vo.DeskColumnsVo;
 import com.xjrsoft.module.form.vo.DeskTableInfoVo;
 import com.xjrsoft.module.generator.constant.ComponentTypeConstant;
-import com.xjrsoft.module.generator.entity.*;
+import com.xjrsoft.module.generator.entity.ColumnConfig;
+import com.xjrsoft.module.generator.entity.ListConfig;
+import com.xjrsoft.module.generator.entity.QueryConfig;
+import com.xjrsoft.module.generator.entity.TableConfig;
+import com.xjrsoft.module.generator.entity.TableFieldConfig;
+import com.xjrsoft.module.generator.entity.TableStructureConfig;
 import com.xjrsoft.module.generator.utils.GeneratorUtil;
 import com.xjrsoft.module.system.service.ICodeRuleService;
 import lombok.AllArgsConstructor;
@@ -76,7 +98,15 @@ import javax.sql.DataSource;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 

src/main/java/com/xjrsoft/module/hikvision/dto/HikvisionOutinPageDto.java

@@ -4,8 +4,6 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * @author dzx
  * @date 2024年9月19日

src/main/java/com/xjrsoft/module/job/InsertOutInRecordTask.java

@@ -10,7 +10,6 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
-import java.util.Map;
 
 /**
  * @author dzx

src/main/java/com/xjrsoft/module/ledger/controller/WfSubscriptionController.java

@@ -11,11 +11,11 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.ledger.dto.AddWfSubscriptionDto;
 import com.xjrsoft.module.ledger.dto.WfSubscriptionPageDto;
-import com.xjrsoft.module.oa.entity.WfSubscription;
-import com.xjrsoft.module.oa.service.IWfSubscriptionService;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionExcelVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionListInfoVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionPageVo;
+import com.xjrsoft.module.oa.entity.WfSubscription;
+import com.xjrsoft.module.oa.service.IWfSubscriptionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

src/main/java/com/xjrsoft/module/liteflow/node/WfUpdateStateNode.java

@@ -3,8 +3,6 @@ package com.xjrsoft.module.liteflow.node;
 import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xjrsoft.common.enums.WorkflowApproveType;
-import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
-import com.xjrsoft.module.student.service.IBaseStudentAssessmentClassRelationService;
 import com.xjrsoft.module.workflow.entity.WorkflowRecord;
 import com.xjrsoft.module.workflow.mapper.WorkflowRecordMapper;
 import com.xjrsoft.module.workflow.service.IWorkflowExecuteService;

src/main/java/com/xjrsoft/module/material/dto/FormDataExportQueryDto.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 
 /**

src/main/java/com/xjrsoft/module/material/dto/MaterialTaskAssignAppendixDto.java

@@ -3,7 +3,6 @@ package com.xjrsoft.module.material.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -29,19 +29,27 @@ import com.xjrsoft.module.form.service.IFormExecuteService;
 import com.xjrsoft.module.generator.constant.ComponentTypeConstant;
 import com.xjrsoft.module.generator.entity.TableConfig;
 import com.xjrsoft.module.generator.utils.GeneratorUtil;
-import com.xjrsoft.module.material.dto.*;
+import com.xjrsoft.module.material.dto.AddMaterialTaskAppendixDto;
+import com.xjrsoft.module.material.dto.AddMaterialTaskDto;
+import com.xjrsoft.module.material.dto.FormDataExportQueryDto;
+import com.xjrsoft.module.material.dto.MaterialAssignUserDto;
+import com.xjrsoft.module.material.dto.MaterialTaskAssignAppendixDto;
+import com.xjrsoft.module.material.dto.MaterialTaskAssignListDto;
 import com.xjrsoft.module.material.entity.MaterialTask;
 import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
 import com.xjrsoft.module.material.entity.MaterialTaskAssign;
 import com.xjrsoft.module.material.entity.MaterialType;
-import com.xjrsoft.module.material.entity.MaterialTypeAssign;
 import com.xjrsoft.module.material.mapper.MaterialTaskAppendixMapper;
 import com.xjrsoft.module.material.mapper.MaterialTaskAssignMapper;
 import com.xjrsoft.module.material.mapper.MaterialTaskMapper;
 import com.xjrsoft.module.material.service.IMaterialTaskAppendixService;
 import com.xjrsoft.module.material.service.IMaterialTaskService;
 import com.xjrsoft.module.material.service.IMaterialTypeService;
-import com.xjrsoft.module.material.vo.*;
+import com.xjrsoft.module.material.vo.MaterialTaskAppendixVo;
+import com.xjrsoft.module.material.vo.MaterialTaskAssignListVo;
+import com.xjrsoft.module.material.vo.MaterialTaskAssignUserVo;
+import com.xjrsoft.module.material.vo.MaterialTaskVo;
+import com.xjrsoft.module.material.vo.MaterialTypeVo;
 import com.xjrsoft.module.organization.dto.WeChatSendMessageDto;
 import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.entity.User;
@@ -55,7 +63,6 @@ import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.vo.XjrUserVo;
-import com.xjrsoft.module.workflow.entity.WorkflowSchema;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -66,7 +73,12 @@ import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.time.LocalDate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 

src/main/java/com/xjrsoft/module/material/vo/MaterialTaskExcelVo.java

@@ -1,15 +1,9 @@
 package com.xjrsoft.module.material.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ContentStyle;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
-import java.util.List;
-
 /**
 * @title: 材料提交任务分页列表出参
 * @Author baicai

src/main/java/com/xjrsoft/module/oa/mapper/WfSubscriptionMapper.java

@@ -3,9 +3,9 @@ package com.xjrsoft.module.oa.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.ledger.dto.WfSubscriptionPageDto;
-import com.xjrsoft.module.oa.entity.WfSubscription;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionListInfoVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionPageVo;
+import com.xjrsoft.module.oa.entity.WfSubscription;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/xjrsoft/module/oa/service/IWfSubscriptionService.java

@@ -3,10 +3,10 @@ package com.xjrsoft.module.oa.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.ledger.dto.WfSubscriptionPageDto;
-import com.xjrsoft.module.oa.entity.WfSubscription;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionExcelVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionListInfoVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionPageVo;
+import com.xjrsoft.module.oa.entity.WfSubscription;
 
 import java.util.List;
 

src/main/java/com/xjrsoft/module/oa/service/impl/WfMeetingApplyServiceImpl.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.oa.mapper.WfMeetingApplyMapper;
 import com.xjrsoft.module.oa.entity.WfMeetingApply;
+import com.xjrsoft.module.oa.mapper.WfMeetingApplyMapper;
 import com.xjrsoft.module.oa.service.IWfMeetingApplyService;
 import com.xjrsoft.module.organization.dto.WeChatSendMessageDto;
 import com.xjrsoft.module.organization.entity.User;

src/main/java/com/xjrsoft/module/oa/service/impl/WfSubscriptionServiceImpl.java

@@ -9,16 +9,16 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.ledger.dto.WfSubscriptionPageDto;
-import com.xjrsoft.module.oa.entity.WfSubscription;
-import com.xjrsoft.module.oa.entity.WfSubscriptionList;
-import com.xjrsoft.module.oa.mapper.WfSubscriptionListMapper;
-import com.xjrsoft.module.oa.mapper.WfSubscriptionMapper;
-import com.xjrsoft.module.oa.service.IWfSubscriptionService;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionExcelVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionListInfoVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionListVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionPageVo;
 import com.xjrsoft.module.ledger.vo.WorkflowRecordVo;
+import com.xjrsoft.module.oa.entity.WfSubscription;
+import com.xjrsoft.module.oa.entity.WfSubscriptionList;
+import com.xjrsoft.module.oa.mapper.WfSubscriptionListMapper;
+import com.xjrsoft.module.oa.mapper.WfSubscriptionMapper;
+import com.xjrsoft.module.oa.service.IWfSubscriptionService;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.workflow.entity.WorkflowExtra;

src/main/java/com/xjrsoft/module/oa/vo/ProclamationVo.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -98,7 +98,6 @@ import com.xjrsoft.module.workflow.entity.WorkflowCirculated;
 import com.xjrsoft.module.workflow.entity.WorkflowSchema;
 import com.xjrsoft.module.workflow.service.IWorkflowCirculatedService;
 import com.xjrsoft.module.workflow.service.IWorkflowExecuteService;
-import com.xjrsoft.module.workflow.vo.CirculatedTaskPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

src/main/java/com/xjrsoft/module/organization/service/impl/UserStudentServiceImpl.java

@@ -6,7 +6,6 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.module.organization.dto.UserStudentAddDto;
 import com.xjrsoft.module.organization.dto.UserStudentDeleteDto;
-import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.entity.UserStudent;
 import com.xjrsoft.module.organization.mapper.UserStudentMapper;
 import com.xjrsoft.module.organization.service.IUserStudentService;

src/main/java/com/xjrsoft/module/outint/controller/TeacherOutInRecordController.java

@@ -7,14 +7,11 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.LocalDateTimeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.hikvision.util.ApiUtil;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.outint.dto.AddTeacherOutInRecordDto;
 import com.xjrsoft.module.outint.dto.SyncHikvsionDataDto;

src/main/java/com/xjrsoft/module/outint/service/ITeacherOutInRecordService.java

@@ -4,7 +4,6 @@ import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.outint.dto.SyncHikvsionDataDto;
 import com.xjrsoft.module.outint.dto.TeacherOutInRecordDto;
 import com.xjrsoft.module.outint.entity.TeacherOutInRecord;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

src/main/java/com/xjrsoft/module/outint/service/impl/TeacherOutInRecordServiceImpl.java

@@ -3,7 +3,6 @@ package com.xjrsoft.module.outint.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.xjrsoft.common.exception.MyException;
@@ -11,7 +10,6 @@ import com.xjrsoft.module.hikvision.entity.HikvisionData;
 import com.xjrsoft.module.hikvision.service.IHikvisionDataService;
 import com.xjrsoft.module.hikvision.util.ApiUtil;
 import com.xjrsoft.module.hikvision.util.OutInRecordUtil;
-import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.outint.dto.SyncHikvsionDataDto;
 import com.xjrsoft.module.outint.dto.TeacherOutInRecordDto;
 import com.xjrsoft.module.outint.entity.TeacherOutInRecord;

src/main/java/com/xjrsoft/module/personnel/controller/FaceManagementController.java

@@ -15,7 +15,6 @@ 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.ImageUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.personnel.dto.AddFaceManagementDto;
 import com.xjrsoft.module.personnel.dto.FaceManagementPageDto;

src/main/java/com/xjrsoft/module/personnel/dto/UpdateCarMessageApplyEndTimeDto.java

@@ -5,7 +5,6 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 
 

src/main/java/com/xjrsoft/module/personnel/vo/BasePersonnelLabourCapitalMonthPageVo.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.LinkedHashMap;
-import java.util.Map;
 
 /**
  * @title: 月工资条分页列表出参

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -55,7 +55,6 @@ import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.time.DayOfWeek;
 import java.time.Duration;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;

src/main/java/com/xjrsoft/module/schedule/dto/ScheduleWeekDto.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 /**

src/main/java/com/xjrsoft/module/schedule/dto/WfCourseAdjustDto.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 /**

src/main/java/com/xjrsoft/module/schedule/service/impl/WfCourseAdjustServiceImpl.java

@@ -11,7 +11,6 @@ import com.xjrsoft.module.courseTable.entity.CourseTable;
 import com.xjrsoft.module.courseTable.service.ICourseTableService;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.service.IUserService;
-import com.xjrsoft.module.room.entity.RoomBed;
 import com.xjrsoft.module.schedule.dto.WfCourseAdjustDto;
 import com.xjrsoft.module.schedule.entity.CourseTableBak;
 import com.xjrsoft.module.schedule.entity.WfCourseAdjust;

src/main/java/com/xjrsoft/module/schedule/vo/CourseTableVo.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -12,7 +12,6 @@ import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentInspectionDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
 import com.xjrsoft.module.student.dto.CalssQuantitativeAssessmentPageDto;
-import com.xjrsoft.module.student.dto.QuantitativeAssessmentExcelDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentInspectionDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;

src/main/java/com/xjrsoft/module/student/controller/BaseStudentInfoController.java

@@ -14,7 +14,6 @@ import com.xjrsoft.module.student.dto.BaseStudentInfoDetailDto;
 import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
 import com.xjrsoft.module.student.dto.BaseStudentSimpleInfoDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
-import com.xjrsoft.module.student.entity.BaseStudent;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
 import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
 import com.xjrsoft.module.student.service.IStudentManagerService;

src/main/java/com/xjrsoft/module/student/controller/StudentConsumeDateController.java

@@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.xjrsoft.common.exception.MyException;
-import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -35,7 +34,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/module/student/dto/AddBasePunishmentStudentHandleDto.java

@@ -6,7 +6,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentAssessmentInspectionDto.java

@@ -5,9 +5,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.text.DateFormat;
 import java.time.LocalDate;
-import java.util.Date;
 
 
 

src/main/java/com/xjrsoft/module/student/dto/AddStudentReportRecordDto.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;