班级量化考核

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

@@ -1,9 +1,12 @@
 package com.xjrsoft.module.student.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.checkerframework.checker.formatter.qual.Format;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -45,12 +48,12 @@ public class CalssQuantitativeAssessmentPageDto extends PageInput {
     /**
      * 考核开始时间
      */
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty(value = "开始时间")
     private LocalDateTime startTime;
     /**
      * 考核结束时间
      */
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty(value = "结束时间", hidden = true)
     private LocalDateTime endTime;
     /**
      * 班级Id集合
@@ -61,6 +64,6 @@ public class CalssQuantitativeAssessmentPageDto extends PageInput {
     /**
      * 学期ID(base_semester)每一种统计数据需要关联学期
      */
-    @ApiModelProperty(value = "学期ID(base_semester)", hidden = true)
+    @ApiModelProperty(value = "学期ID(base_semester)")
     private Long baseStudentAssessmentCategoryId;
 }

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
@@ -18,14 +20,48 @@ public class QuantitativeAssessmentExcelDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 年月（2023-12）
-    */
-    @ApiModelProperty("年月（2023-12）")
-    private String yearAndMonth;
-
+     * 入学年级(base_grade)
+     */
+    @ApiModelProperty("入学年级(base_grade)")
+    private Long gradeId;
+    /**
+     * 学期ID(base_semester)每一种统计数据需要关联学期
+     */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+     * 班级Id
+     */
+    @ApiModelProperty("班级Id")
+    private Long classId;
+    /**
+     * 班级状态
+     */
+    @ApiModelProperty("班级状态")
+    private Integer classStatus;
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    private String name;
+    /**
+     * 考核开始时间
+     */
+    @ApiModelProperty(value = "开始时间")
+    private LocalDateTime startTime;
+    /**
+     * 考核结束时间
+     */
+    @ApiModelProperty(value = "结束时间", hidden = true)
+    private LocalDateTime endTime;
+    /**
+     * 班级Id集合
+     */
+    @ApiModelProperty(value = "班级Id集合", hidden = true)
+    private List<Long> classIdList;
     /**
      * 子表的类型
      */
-    @ApiModelProperty("子表的类型")
+    @ApiModelProperty(value = "子表的类型", hidden = true)
     private Long baseStudentAssessmentCategoryId;
 }

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -48,6 +48,7 @@ import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,6 +56,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import java.io.ByteArrayOutputStream;
+import java.time.LocalDateTime;
+import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -187,8 +190,9 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
 
         //获取需要导出的子表
         List<Long> baseStudentAssessmentCategoryIdList = new ArrayList<>();
-        baseStudentAssessmentCategoryIdList.add(1727155216239882240L);
-        baseStudentAssessmentCategoryIdList.add(1727154864019009536L);
+        baseStudentAssessmentCategoryIdList.add(1768178717588197377L);
+        baseStudentAssessmentCategoryIdList.add(1768179375900987394L);
+        baseStudentAssessmentCategoryIdList.add(1769927649167151105L);
 
         LambdaQueryWrapper<BaseStudentAssessmentCategory> baseStudentAssessmentCategoryLambdaQueryWrapper = new LambdaQueryWrapper<>();
         baseStudentAssessmentCategoryLambdaQueryWrapper
@@ -203,7 +207,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
 
             //开始处理写入
             try (ExcelWriter excelWriter = EasyExcel.write(bot, QuantitativeAssessmentSubTableExcelVo.class).registerWriteHandler(excelFillCellMergeStrategy).build()) {
-                int no = 0;
+                int no = 1;
                 for (BaseStudentAssessmentCategory bsac : baseStudentAssessmentCategorieList) {
                     dto.setBaseStudentAssessmentCategoryId(bsac.getId());
                     //sheet名
@@ -217,7 +221,107 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                     excelWriter.write(quantitativeAssessmentSubTableExcelVoList, writeSheet);
                 }
                 //TODO 班级量化考核统计表总
+                //以班级为数据的基础进行数据的填充
+                MPJLambdaWrapper<BaseClass> baseClassMPJLambdaWrapper = new MPJLambdaWrapper<>();
+                baseClassMPJLambdaWrapper
+                        .selectAs(BaseClass::getTeacherId, CalssQuantitativeAssessmentPageVo::getHeadTeacherId)
+                        .selectAs(XjrUser::getUserName, CalssQuantitativeAssessmentPageVo::getOa)
+                        .selectAs(XjrUser::getName, CalssQuantitativeAssessmentPageVo::getHeadTeacherName)
+                        .selectAs(BaseClass::getId, CalssQuantitativeAssessmentPageVo::getClassId)
+                        .selectAs(BaseClass::getName, CalssQuantitativeAssessmentPageVo::getClassName)
+                        .selectAs(BaseClassMajorSet::getTotalStudent, CalssQuantitativeAssessmentPageVo::getStudentNum)
+                        .selectAs(BaseClass::getIsGraduate, CalssQuantitativeAssessmentPageVo::getClassStatus)
+                        .leftJoin(XjrUser.class, XjrUser::getId, BaseClass::getTeacherId)
+                        .leftJoin(BaseClassMajorSet.class, BaseClassMajorSet::getClassId, BaseClass::getId)
+                        .eq(dto.getGradeId() != null, BaseClass::getGradeId, dto.getGradeId())
+                        .eq(dto.getClassId() != null, BaseClass::getId, dto.getClassId())
+                        .eq(dto.getClassStatus() != null, BaseClass::getIsGraduate, dto.getClassStatus())
+                        .like(dto.getName() != null && !dto.getName().equals(""), XjrUser::getName, dto.getName())
+                        .disableSubLogicDel();
+
+                List<CalssQuantitativeAssessmentPageVo> resultList = baseClassMapper.selectJoinList(CalssQuantitativeAssessmentPageVo.class, baseClassMPJLambdaWrapper);
+
+                //当前数据记录班级id
+                List<Long> classIdList = new ArrayList<>();
+                for(CalssQuantitativeAssessmentPageVo c: resultList){
+                    classIdList.add(Long.parseLong(c.getClassId()));
+                }
+                dto.setClassIdList(classIdList);
+
+                if(dto.getStartTime() != null){
+                    // 获取上个月的最后一秒
+                    LocalDateTime lastMonthEnd = dto.getStartTime().minusMonths(1).with(TemporalAdjusters.lastDayOfMonth()).withHour(23).withMinute(59).withSecond(59);
+
+                    // 获取下个月的第一秒
+                    LocalDateTime nextMonthStart = dto.getStartTime().plusMonths(1).with(TemporalAdjusters.firstDayOfMonth()).withHour(0).withMinute(0).withSecond(0);
+                    dto.setStartTime(lastMonthEnd);
+                    dto.setEndTime(nextMonthStart);
+                }
+
+                if(!classIdList.isEmpty()){
+                    CalssQuantitativeAssessmentPageDto calssQuantitativeAssessmentPageDto = new CalssQuantitativeAssessmentPageDto();
+                    BeanUtils.copyProperties(dto, calssQuantitativeAssessmentPageDto);
+
 
+                    //学生个人行为
+                    dto.setBaseStudentAssessmentCategoryId(1768178717588197377L);
+                    Map<Long , QuantitativeAssessmentSingleScoreVo> individualBehaviorMap = getQuantitativeAssessmentSingleScoreMap(calssQuantitativeAssessmentPageDto);
+
+                    //常规管理
+                    dto.setBaseStudentAssessmentCategoryId(1769927649167151105L);
+                    Map<Long , QuantitativeAssessmentSingleScoreVo> conventionalManagementMap = getQuantitativeAssessmentSingleScoreMap(calssQuantitativeAssessmentPageDto);
+
+                    //获奖及荣誉奖彰
+                    dto.setBaseStudentAssessmentCategoryId(1768179375900987394L);
+                    Map<Long , QuantitativeAssessmentSingleScoreVo> awardsAndHonorableMap = getQuantitativeAssessmentSingleScoreMap(calssQuantitativeAssessmentPageDto);
+
+                    //准军事化考核
+                    List<QuantitativeAssessmentSingleScoreVo> paramilitaryList = assessmentInspectionMapper.getParamilitaryList(new QuantitativeAssessmentSingleScoreDto(){{
+                        setClassIdList(classIdList);
+                    }});
+                    Map<Long , QuantitativeAssessmentSingleScoreVo> paramilitaryMap = new HashMap<>();
+                    for (QuantitativeAssessmentSingleScoreVo q : paramilitaryList) {
+                        awardsAndHonorableMap.put(q.getClassId(), q);
+                    }
+
+                    //将结果写进对应的班级里
+                    for(CalssQuantitativeAssessmentPageVo c: resultList){
+                        Long classId = Long.parseLong(c.getClassId());
+                        if(individualBehaviorMap.get(classId) != null){
+                            c.setStuPersonalBehaviorSubScore(individualBehaviorMap.get(classId).getSumScore());
+                            c.setStuPersonalBehaviorScore((100 + individualBehaviorMap.get(classId).getSumScore())/100*25);
+                        }
+
+                        if(conventionalManagementMap.get(classId) != null){
+                            c.setClassConventionalManageSubScore(conventionalManagementMap.get(classId).getSumScore());
+                            c.setClassConventionalManageScore((100 + conventionalManagementMap.get(classId).getSumScore())/100*25);
+                        }
+
+                        if(awardsAndHonorableMap.get(classId) != null){
+                            c.setHonorSumScore(awardsAndHonorableMap.get(classId).getSumScore());
+                            if(awardsAndHonorableMap.get(classId).getSumScore() < 10){
+                                c.setHonorScore(awardsAndHonorableMap.get(classId).getSumScore());
+                            }else {
+                                c.setHonorScore(10D);
+                            }
+                        }
+
+                        if(c.getClassStatus() != null){
+                            if(c.getClassStatus() == 1){
+                                c.setClassStatusCn("在读");
+                            }
+                            if(c.getClassStatus() == 2){
+                                c.setClassStatusCn("毕业");
+                            }
+                        }
+                    }
+                }
+                //sheet名
+                String sheetName = "量化考核总表";
+
+//                WriteSheet writeSheet = EasyExcel.writerSheet(0, sheetName ).build();
+//
+//                excelWriter.write(resultList, writeSheet);
             }
             /*for (BaseStudentAssessmentCategory bsac : baseStudentAssessmentCategorieList) {
                 dto.setBaseStudentAssessmentCategoryId(bsac.getId());
@@ -271,6 +375,16 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
         }
         dto.setClassIdList(classIdList);
 
+        if(dto.getStartTime() != null){
+            // 获取上个月的最后一秒
+            LocalDateTime lastMonthEnd = dto.getStartTime().minusMonths(1).with(TemporalAdjusters.lastDayOfMonth()).withHour(23).withMinute(59).withSecond(59);
+
+            // 获取下个月的第一秒
+            LocalDateTime nextMonthStart = dto.getStartTime().plusMonths(1).with(TemporalAdjusters.firstDayOfMonth()).withHour(0).withMinute(0).withSecond(0);
+            dto.setStartTime(lastMonthEnd);
+            dto.setEndTime(nextMonthStart);
+        }
+
         if(!classIdList.isEmpty()){
             //学生个人行为
             dto.setBaseStudentAssessmentCategoryId(1768178717588197377L);

src/main/java/com/xjrsoft/module/student/vo/CalssQuantitativeAssessmentPageVo.java

@@ -1,5 +1,8 @@
 package com.xjrsoft.module.student.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,59 +15,99 @@ import lombok.Data;
 @Data
 public class CalssQuantitativeAssessmentPageVo {
     @ApiModelProperty("班主任主键编号")
+    @ExcelIgnore
     private String headTeacherId;
 
     @ApiModelProperty("班主任工号")
+    @ExcelProperty(value = "班主任工号")
+    @ColumnWidth(10)
     private String oa;
 
     @ApiModelProperty("班主任姓名")
+    @ExcelProperty(value = "班主任姓名")
+    @ColumnWidth(10)
     private String headTeacherName;
 
     @ApiModelProperty("班级主键编号")
+    @ExcelIgnore
     private String classId;
 
     @ApiModelProperty("班级名称")
+    @ExcelProperty(value = "班级名称")
+    @ColumnWidth(10)
     private String className;
 
     @ApiModelProperty("班级人数")
+    @ExcelProperty(value = "班级人数")
+    @ColumnWidth(10)
     private Integer studentNum;
 
-    @ApiModelProperty("班级状态")
+    @ApiModelProperty("班级状态(1: 在读 2: 毕业)")
+    @ExcelIgnore
     private Integer classStatus;
 
+    @ApiModelProperty("班级状态")
+    @ExcelProperty(value = "班级状态")
+    @ColumnWidth(10)
+    private String classStatusCn;
+
     @ApiModelProperty("学生个人行为扣分")
+    @ExcelProperty(value = "学生个人行为扣分")
+    @ColumnWidth(10)
     private Double stuPersonalBehaviorSubScore;
 
     @ApiModelProperty("学生个人行为得分")
+    @ExcelProperty(value = "学生个人行为得分")
+    @ColumnWidth(10)
     private Double stuPersonalBehaviorScore;
 
     @ApiModelProperty("常规管理扣分")
+    @ExcelProperty(value = "常规管理扣分")
+    @ColumnWidth(10)
     private Double classConventionalManageSubScore;
 
     @ApiModelProperty("常规管理得分")
+    @ExcelProperty(value = "常规管理得分")
+    @ColumnWidth(10)
     private Double classConventionalManageScore;
 
     @ApiModelProperty("获奖及荣誉表彰汇总")
+    @ExcelProperty(value = "获奖及荣誉表彰汇总")
+    @ColumnWidth(10)
     private Double honorSumScore;
 
     @ApiModelProperty("获奖及荣誉表彰得分")
+    @ExcelProperty(value = "获奖及荣誉表彰得分")
+    @ColumnWidth(10)
     private Double honorScore;
 
     @ApiModelProperty("准军事化管理效果综合指数")
+    @ExcelProperty(value = "准军事化管理效果综合指数")
+    @ColumnWidth(10)
     private Double militaryManageComprehensiveIndex;
 
     @ApiModelProperty("准军事化管理效果得分")
+    @ExcelProperty(value = "准军事化管理效果得分")
+    @ColumnWidth(10)
     private Double militaryManageScore;
 
     @ApiModelProperty("任课教师考核综合指数")
+    @ExcelProperty(value = "任课教师考核综合指数")
+    @ColumnWidth(10)
     private Double teacherAssessComprehensiveIndex;
 
     @ApiModelProperty("任课教师考核得分")
+    @ExcelProperty(value = "任课教师考核得分")
+    @ColumnWidth(10)
     private Double teacherAssessScore;
 
     @ApiModelProperty("考核总得分")
+    @ExcelProperty(value = "考核总得分")
+    @ColumnWidth(10)
     private Double assessSumScore;
 
     @ApiModelProperty("考核金额")
+    @ExcelProperty(value = "考核金额")
+    @ColumnWidth(10)
     private Double assessMoney;
 }

src/main/java/com/xjrsoft/module/student/vo/QuantitativeAssessmentSubTableExcelVo.java

@@ -46,7 +46,7 @@ public class QuantitativeAssessmentSubTableExcelVo {
     /**
      * 班主任姓名
      */
-    @ExcelProperty(index = 1, value = "班主任姓名")
+    @ExcelProperty(index = 1, value = "班主任OA")
     @ColumnWidth(10)
     @ApiModelProperty("班主任姓名")
     private String headTeacherName;

src/main/java/com/xjrsoft/module/textbook/controller/TextbookCoreAttributeController.java

@@ -0,0 +1,125 @@
+package com.xjrsoft.module.textbook.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+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.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.textbook.dto.AddTextbookCoreAttributeDto;
+import com.xjrsoft.module.textbook.dto.UpdateTextbookCoreAttributeDto;
+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.textbook.dto.TextbookCoreAttributePageDto;
+import com.xjrsoft.module.textbook.entity.TextbookCoreAttribute;
+import com.xjrsoft.module.textbook.service.ITextbookCoreAttributeService;
+import com.xjrsoft.module.textbook.vo.TextbookCoreAttributePageVo;
+
+import com.xjrsoft.module.textbook.vo.TextbookCoreAttributeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 教材核心信息管理
+* @Author szs
+* @Date: 2024-04-08
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/textbook" + "/textbookCoreAttribute")
+@Api(value = "/textbook"  + "/textbookCoreAttribute",tags = "教材核心信息管理代码")
+@AllArgsConstructor
+public class TextbookCoreAttributeController {
+
+
+    private final ITextbookCoreAttributeService textbookCoreAttributeService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="教材核心信息管理列表(分页)")
+    @SaCheckPermission("textbookcoreattribute:detail")
+    public RT<PageOutput<TextbookCoreAttributePageVo>> page(@Valid TextbookCoreAttributePageDto dto){
+
+        LambdaQueryWrapper<TextbookCoreAttribute> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(TextbookCoreAttribute::getId)
+                .select(TextbookCoreAttribute.class,x -> VoToColumnUtil.fieldsToColumns(TextbookCoreAttributePageVo.class).contains(x.getProperty()));
+        IPage<TextbookCoreAttribute> page = textbookCoreAttributeService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<TextbookCoreAttributePageVo> pageOutput = ConventPage.getPageOutput(page, TextbookCoreAttributePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询教材核心信息管理信息")
+    @SaCheckPermission("textbookcoreattribute:detail")
+    public RT<TextbookCoreAttributeVo> info(@RequestParam Long id){
+        TextbookCoreAttribute textbookCoreAttribute = textbookCoreAttributeService.getById(id);
+        if (textbookCoreAttribute == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(textbookCoreAttribute, TextbookCoreAttributeVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增教材核心信息管理")
+    @SaCheckPermission("textbookcoreattribute:add")
+    public RT<Boolean> add(@Valid @RequestBody AddTextbookCoreAttributeDto dto){
+        TextbookCoreAttribute textbookCoreAttribute = BeanUtil.toBean(dto, TextbookCoreAttribute.class);
+        boolean isSuccess = textbookCoreAttributeService.save(textbookCoreAttribute);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改教材核心信息管理")
+    @SaCheckPermission("textbookcoreattribute:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateTextbookCoreAttributeDto dto){
+
+        TextbookCoreAttribute textbookCoreAttribute = BeanUtil.toBean(dto, TextbookCoreAttribute.class);
+        return RT.ok(textbookCoreAttributeService.updateById(textbookCoreAttribute));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除教材核心信息管理")
+    @SaCheckPermission("textbookcoreattribute:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(textbookCoreAttributeService.removeBatchByIds(ids));
+
+    }
+    @PostMapping("/import")
+    @ApiOperation(value = "导入")
+    public RT<Boolean> importData(@RequestParam MultipartFile file) throws IOException {
+        List<TextbookCoreAttributePageVo> savedDataList = EasyExcel.read(file.getInputStream()).head(TextbookCoreAttributePageVo.class).sheet().doReadSync();
+        Boolean result = textbookCoreAttributeService.saveBatch(BeanUtil.copyToList(savedDataList, TextbookCoreAttribute.class));
+        return RT.ok(result);
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid TextbookCoreAttributePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<TextbookCoreAttributePageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<TextbookCoreAttributePageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, TextbookCoreAttributePageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "TextbookCoreAttribute" + ExcelTypeEnum.XLSX.getValue());
+    }
+}

src/main/java/com/xjrsoft/module/textbook/dto/AddTextbookCoreAttributeDto.java

@@ -0,0 +1,58 @@
+package com.xjrsoft.module.textbook.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;
+
+
+
+/**
+* @title: 教材核心信息管理
+* @Author szs
+* @Date: 2024-04-08
+* @Version 1.0
+*/
+@Data
+public class AddTextbookCoreAttributeDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 国际标准刊号
+    */
+    @ApiModelProperty("国际标准刊号")
+    private String issn;
+    /**
+    * 国际标准书号
+    */
+    @ApiModelProperty("国际标准书号")
+    private String isbn;
+    /**
+    * 书名
+    */
+    @ApiModelProperty("书名")
+    private String bookName;
+    /**
+    * 出版社
+    */
+    @ApiModelProperty("出版社")
+    private String publishingHouse;
+    /**
+    * 主编
+    */
+    @ApiModelProperty("主编")
+    private String editorInChief;
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/TextbookCoreAttributePageDto.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.textbook.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;
+
+
+/**
+* @title: 教材核心信息管理分页查询入参
+* @Author szs
+* @Date: 2024-04-08
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TextbookCoreAttributePageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/textbook/dto/UpdateTextbookCoreAttributeDto.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.textbook.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;
+
+
+
+/**
+* @title: 教材核心信息管理
+* @Author szs
+* @Date: 2024-04-08
+* @Version 1.0
+*/
+@Data
+public class UpdateTextbookCoreAttributeDto extends AddTextbookCoreAttributeDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/textbook/entity/Textbook.java

@@ -98,6 +98,11 @@ public class Textbook implements Serializable {
     */
     @ApiModelProperty("主编")
     private String editorInChief;
+    /**
+     * 教材核心信息管理id(textbook_core_attribute)
+     */
+    @ApiModelProperty("教材核心信息管理id(textbook_core_attribute)")
+    private Long textbookCoreAttributeId;
     /**
     * 学科组管理编号(subject_group)
     */

src/main/java/com/xjrsoft/module/textbook/entity/TextbookCoreAttribute.java

@@ -0,0 +1,108 @@
+package com.xjrsoft.module.textbook.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+
+/**
+* @title: 教材核心信息管理
+* @Author szs
+* @Date: 2024-04-08
+* @Version 1.0
+*/
+@Data
+@TableName("textbook_core_attribute")
+@ApiModel(value = "textbook_core_attribute", description = "教材核心信息管理")
+public class TextbookCoreAttribute implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 国际标准刊号
+    */
+    @ApiModelProperty("国际标准刊号")
+    private String issn;
+    /**
+    * 国际标准书号
+    */
+    @ApiModelProperty("国际标准书号")
+    private String isbn;
+    /**
+    * 书名
+    */
+    @ApiModelProperty("书名")
+    private String bookName;
+    /**
+    * 出版社
+    */
+    @ApiModelProperty("出版社")
+    private String publishingHouse;
+    /**
+    * 主编
+    */
+    @ApiModelProperty("主编")
+    private String editorInChief;
+
+
+}

src/main/java/com/xjrsoft/module/textbook/mapper/TextbookCoreAttributeMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.textbook.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.textbook.entity.TextbookCoreAttribute;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 教材核心信息管理
+* @Author szs
+* @Date: 2024-04-08
+* @Version 1.0
+*/
+@Mapper
+public interface TextbookCoreAttributeMapper extends MPJBaseMapper<TextbookCoreAttribute> {
+
+}

src/main/java/com/xjrsoft/module/textbook/service/ITextbookCoreAttributeService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.textbook.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.textbook.entity.TextbookCoreAttribute;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 教材核心信息管理
+* @Author szs
+* @Date: 2024-04-08
+* @Version 1.0
+*/
+
+public interface ITextbookCoreAttributeService extends MPJBaseService<TextbookCoreAttribute> {
+}

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookCoreAttributeServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.textbook.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.textbook.entity.TextbookCoreAttribute;
+import com.xjrsoft.module.textbook.mapper.TextbookCoreAttributeMapper;
+import com.xjrsoft.module.textbook.service.ITextbookCoreAttributeService;
+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: 教材核心信息管理
+* @Author szs
+* @Date: 2024-04-08
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class TextbookCoreAttributeServiceImpl extends MPJBaseServiceImpl<TextbookCoreAttributeMapper, TextbookCoreAttribute> implements ITextbookCoreAttributeService {
+}

src/main/java/com/xjrsoft/module/textbook/vo/TextbookCoreAttributePageVo.java

@@ -0,0 +1,118 @@
+package com.xjrsoft.module.textbook.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;
+
+/**
+* @title: 教材核心信息管理分页列表出参
+* @Author szs
+* @Date: 2024-04-08
+* @Version 1.0
+*/
+@Data
+public class TextbookCoreAttributePageVo {
+
+    /**
+    * 主键编号
+    */
+    @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 Integer sortCode;
+    /**
+    * 国际标准刊号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("国际标准刊号")
+    @ApiModelProperty("国际标准刊号")
+    private String issn;
+    /**
+    * 国际标准书号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("国际标准书号")
+    @ApiModelProperty("国际标准书号")
+    private String isbn;
+    /**
+    * 书名
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("书名")
+    @ApiModelProperty("书名")
+    private String bookName;
+    /**
+    * 出版社
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("出版社")
+    @ApiModelProperty("出版社")
+    private String publishingHouse;
+    /**
+    * 主编
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主编")
+    @ApiModelProperty("主编")
+    private String editorInChief;
+
+}

src/main/java/com/xjrsoft/module/textbook/vo/TextbookCoreAttributeVo.java

@@ -0,0 +1,59 @@
+package com.xjrsoft.module.textbook.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 szs
+* @Date: 2024-04-08
+* @Version 1.0
+*/
+@Data
+public class TextbookCoreAttributeVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 国际标准刊号
+    */
+    @ApiModelProperty("国际标准刊号")
+    private String issn;
+    /**
+    * 国际标准书号
+    */
+    @ApiModelProperty("国际标准书号")
+    private String isbn;
+    /**
+    * 书名
+    */
+    @ApiModelProperty("书名")
+    private String bookName;
+    /**
+    * 出版社
+    */
+    @ApiModelProperty("出版社")
+    private String publishingHouse;
+    /**
+    * 主编
+    */
+    @ApiModelProperty("主编")
+    private String editorInChief;
+
+
+
+}

src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -33,10 +33,10 @@
         <if test="dto.semesterId != null">
             and t.base_semester_id = #{dto.semesterId}
         </if>
-        <if test="dto.startDate != null and dto.startDate != ''">
+        <if test="dto.startDate != null">
             and t.assessment_date &gt;= #{dto.startDate}
         </if>
-        <if test="dto.endDate != null and dto.endDate != ''">
+        <if test="dto.endDate != null">
             and t.assessment_date &lt;= #{dto.endDate}
         </if>
         <if test="dto.assessmentUserName != null and dto.assessmentUserName != ''">
@@ -153,8 +153,23 @@
         on t1.id = t.base_student_assessment_inspection_id
         where t1.delete_mark = 0
         and t1.base_student_assessment_category_id = #{dto.baseStudentAssessmentCategoryId}
-        <if test="dto.yearAndMonth != null and dto.yearAndMonth != ''">
-            and date_format(t1.assessment_date, '%Y-%m') = #{dto.yearAndMonth}
+        <if test="dto.classIdList != null and !dto.classIdList.isEmpty()">
+            and t1.class_ids in
+            <foreach item="classId" index="index" collection="dto.classIdList" open="(" close=")" separator=",">
+                #{classId}
+            </foreach>
+        </if>
+        <if test="dto.baseStudentAssessmentCategoryId != null and dto.baseStudentAssessmentCategoryId > 0">
+            and t1.base_student_assessment_category_id = #{dto.baseStudentAssessmentCategoryId}
+        </if>
+        <if test="dto.baseSemesterId != null and dto.baseSemesterId > 0">
+            and t1.base_semester_id &gt; #{dto.baseSemesterId}
+        </if>
+        <if test="dto.startTime != null">
+            and t1.create_date &gt; #{dto.startTime}
+        </if>
+        <if test="dto.endTime != null">
+            and t1.create_date &lt; #{dto.endTime}
         </if>
         group by t.user_id)
         select t4.id                                                    as headTeacherUserId,
@@ -180,8 +195,23 @@
         left join total_score t6 on t6.studentUserId = t.user_id
         where t1.delete_mark = 0
         and t1.base_student_assessment_category_id = #{dto.baseStudentAssessmentCategoryId}
-        <if test="dto.yearAndMonth != null and dto.yearAndMonth != ''">
-            and date_format(t1.assessment_date, '%Y-%m') = #{dto.yearAndMonth}
+        <if test="dto.classIdList != null and !dto.classIdList.isEmpty()">
+            and t1.class_ids in
+            <foreach item="classId" index="index" collection="dto.classIdList" open="(" close=")" separator=",">
+                #{classId}
+            </foreach>
+        </if>
+        <if test="dto.baseStudentAssessmentCategoryId != null and dto.baseStudentAssessmentCategoryId > 0">
+            and t1.base_student_assessment_category_id = #{dto.baseStudentAssessmentCategoryId}
+        </if>
+        <if test="dto.baseSemesterId != null and dto.baseSemesterId > 0">
+            and t1.base_semester_id &gt; #{dto.baseSemesterId}
+        </if>
+        <if test="dto.startTime != null">
+            and t1.create_date &gt; #{dto.startTime}
+        </if>
+        <if test="dto.endTime != null">
+            and t1.create_date &lt; #{dto.endTime}
         </if>
         order by t.class_id, t.user_id
     </select>
@@ -204,10 +234,10 @@
         <if test="dto.baseSemesterId != null and dto.baseSemesterId > 0">
             and t.base_semester_id &gt; #{dto.baseSemesterId}
         </if>
-        <if test="dto.startTime != null and dto.startTime != ''">
+        <if test="dto.startTime != null">
             and t.create_date &gt; #{dto.startTime}
         </if>
-        <if test="dto.endTime != null and dto.endTime != ''">
+        <if test="dto.endTime != null">
             and t.create_date &lt; #{dto.endTime}
         </if>
         group by t.class_ids;
@@ -225,10 +255,10 @@
         <foreach item="classId" index="index" collection="dto.classIdList" open="(" close=")" separator=",">
             #{classId}
         </foreach>
-        <if test="dto.startTime != null and dto.startTime != ''">
+        <if test="dto.startTime != null">
             and t1.create_date &gt; #{dto.startTime}
         </if>
-        <if test="dto.endTime != null and dto.endTime != ''">
+        <if test="dto.endTime != null">
             and t1.create_date &lt; #{dto.endTime}
         </if>
         group by t.class_id;
@@ -246,10 +276,10 @@
         <foreach item="classId" index="index" collection="dto.classIdList" open="(" close=")" separator=",">
             #{classId}
         </foreach>
-        <if test="dto.startTime != null and dto.startTime != ''">
+        <if test="dto.startTime != null">
             and t1.create_date &gt; #{dto.startTime}
         </if>
-        <if test="dto.endTime != null and dto.endTime != ''">
+        <if test="dto.endTime != null">
             and t1.create_date &lt; #{dto.endTime}
         </if>
         group by t.class_id;
@@ -267,10 +297,10 @@
         <foreach item="classId" index="index" collection="dto.classIdList" open="(" close=")" separator=",">
             #{classId}
         </foreach>
-        <if test="dto.startTime != null and dto.startTime != ''">
+        <if test="dto.startTime != null">
             and t1.create_date &gt; #{dto.startTime}
         </if>
-        <if test="dto.endTime != null and dto.endTime != ''">
+        <if test="dto.endTime != null">
             and t1.create_date &lt; #{dto.endTime}
         </if>
         group by t.class_id;

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

@@ -2718,6 +2718,35 @@ public class FreeMarkerGeneratorTest {
 
         IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
 
+        apiGeneratorService.generateCodes(params);
+    }
+    /**
+     * 教材核心信息管理
+     *
+     * @throws IOException
+     */
+    @Test
+    public void gcTextbookCoreAttribute() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("textbook_core_attribute");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("szs");//作者名称
+        params.setPackageName("textbook");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(true);//是否生成导入接口
+        params.setExport(true);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
         apiGeneratorService.generateCodes(params);
     }
 }