Merge branch 'pre'

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

@@ -11,6 +11,7 @@ import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.handler.FormContentStyleStrategy;
 import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.DatasourceUtil;
 import com.xjrsoft.common.utils.LocalDateTimeUtil;
 import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto;
@@ -35,6 +36,7 @@ import com.xjrsoft.module.form.service.IFormTemplateService;
 import com.xjrsoft.module.generator.constant.ComponentTypeConstant;
 import com.xjrsoft.module.generator.entity.ColumnConfig;
 import com.xjrsoft.module.generator.entity.TableConfig;
+import com.xjrsoft.module.student.service.IStudentConsumeDateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -84,6 +86,7 @@ public class FormExecuteController {
     private final IFormReleaseService formReleaseService;
     
     private final IFormTemplateService formTemplateService;
+    private final IStudentConsumeDateService studentConsumeDateService;
 
     /**
      * 自定义表单 根据配置获取列表数据 不分页
@@ -305,6 +308,16 @@ public class FormExecuteController {
     @PostMapping("/import")
     @ApiOperation(value = "导入")
     public R importData(@RequestParam String releaseId, @RequestParam MultipartFile file) throws IOException {
+
+        if( "1815674695242059776".equals(releaseId)) {
+            String result = studentConsumeDateService.excelImport(file);
+            if (result.length() > 0) {
+                throw new MyException(result);
+            }
+
+            return R.ok("全部成功", true);
+        }
+
         FormRelease formRelease = formReleaseService.getById(releaseId);
         FormReleaseConfig formReleaseConfig = JSONUtil.toBean(formRelease.getConfigJson(), FormReleaseConfig.class);
         // 配置excel第一行字段名

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

@@ -2,6 +2,7 @@ package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.model.result.RT;
@@ -34,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
@@ -127,9 +129,11 @@ public class BaseStudentAssessmentInspectionController {
 //    @PostMapping("/export-query")
 //    @ApiOperation(value = "入参导出")
 //    public ResponseEntity<byte[]>  exportDataQuery(@Valid @RequestBody QuantitativeAssessmentExcelDto dto) {
-    @GetMapping("/export")
+    @PostMapping("/export-query")
     @ApiOperation(value = "导出")
-    public ResponseEntity<byte[]>  exportDataQuery() {
-        return inspectionService.getQuantitativeAssessmentExcelByte(new QuantitativeAssessmentExcelDto());
+    public ResponseEntity<byte[]>  exportDataQuery(@Valid  @RequestBody CalssQuantitativeAssessmentPageDto dto) throws IOException {
+        byte[] bytes = inspectionService.getExcelByte(dto);
+        String fileName = "recordExport" + ExcelTypeEnum.XLSX.getValue();
+        return RT.fileStream(bytes, fileName);
     }
 }

src/main/java/com/xjrsoft/module/student/service/IBaseStudentAssessmentInspectionService.java

@@ -15,6 +15,8 @@ import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo;
 import com.xjrsoft.module.student.vo.CalssQuantitativeAssessmentPageVo;
 import org.springframework.http.ResponseEntity;
 
+import java.io.IOException;
+
 /**
 * @title: 学生班级巡查考核
 * @Author dzx
@@ -68,4 +70,6 @@ public interface IBaseStudentAssessmentInspectionService extends MPJBaseService<
      * @return
      */
     Boolean noticeTeacher(Long id);
+
+    byte[] getExcelByte(CalssQuantitativeAssessmentPageDto dto) throws IOException;
 }

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

@@ -22,6 +22,7 @@ import com.xjrsoft.common.enums.ScoreTypeEnum;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.common.utils.excel.ExcelMergeUtil;
+import com.xjrsoft.module.attendance.entity.AttendanceStatistics;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.mapper.BaseClassMapper;
 import com.xjrsoft.module.evaluate.dto.TeaEvaluateClassDto;
@@ -64,6 +65,16 @@ import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import lombok.AllArgsConstructor;
 import me.zhyd.oauth.log.Log;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+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.beans.BeanUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -73,11 +84,13 @@ import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -264,8 +277,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                         .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();
+                        .like(dto.getName() != null && !dto.getName().equals(""), XjrUser::getName, dto.getName());
 
                 List<CalssQuantitativeAssessmentPageVo> resultList = baseClassMapper.selectJoinList(CalssQuantitativeAssessmentPageVo.class, baseClassMPJLambdaWrapper);
 
@@ -329,24 +341,46 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
 
                     //将结果写进对应的班级里
                     for(CalssQuantitativeAssessmentPageVo c: resultList){
+                        if(c.getOa() == null){
+                            c.setOa(" ");
+                        }
+                        if(c.getHeadTeacherName() == null){
+                            c.setHeadTeacherName(" ");
+                        }
                         Long classId = Long.parseLong(c.getClassId());
+                        c.setStuPersonalBehaviorSubScore(" ");
+                        c.setStuPersonalBehaviorScore(" ");
                         if(individualBehaviorMap.get(classId) != null){
-                            c.setStuPersonalBehaviorSubScore(individualBehaviorMap.get(classId).getSumScore());
-                            c.setStuPersonalBehaviorScore((100 + individualBehaviorMap.get(classId).getSumScore())/100*25);
+                            Double sumScore = individualBehaviorMap.get(classId).getSumScore();
+                            if(sumScore != null){
+                                c.setStuPersonalBehaviorSubScore(sumScore.toString());
+                                double v = (100 + sumScore) / 100 * 25;
+                                c.setStuPersonalBehaviorScore(v + "");
+                            }
                         }
 
+                        c.setClassConventionalManageSubScore(" ");
+                        c.setClassConventionalManageScore(" ");
                         if(conventionalManagementMap.get(classId) != null){
-                            QuantitativeAssessmentSingleScoreVo scoreVo = conventionalManagementMap.get(classId);
-                            c.setClassConventionalManageSubScore(conventionalManagementMap.get(classId).getSumScore());
-                            c.setClassConventionalManageScore((100 + conventionalManagementMap.get(classId).getSumScore())/100*25);
+                            Double sumScore = conventionalManagementMap.get(classId).getSumScore();
+                            if(sumScore != null){
+                                c.setClassConventionalManageSubScore(sumScore.toString());
+                                double v = (100 + sumScore) / 100 * 25;
+                                c.setClassConventionalManageScore(v + "");
+                            }
                         }
 
+                        c.setHonorSumScore(" ");
+                        c.setHonorScore(" ");
                         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);
+                            Double sumScore = awardsAndHonorableMap.get(classId).getSumScore();
+                            if(sumScore != null){
+                                c.setHonorSumScore(sumScore.toString());
+                                if(sumScore < 10){
+                                    c.setHonorScore(sumScore.toString());
+                                }else {
+                                    c.setHonorScore("10");
+                                }
                             }
                         }
 
@@ -359,6 +393,8 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                             }
                         }
 
+                        c.setTeacherAssessComprehensiveIndex(" ");
+                        c.setTeacherAssessScore(" ");
                         if(classEvaluateMap.containsKey(classId)){
                             Map<Long, List<TeaEvaluateClassListVo>> evaluateCategoryMap = classEvaluateMap.get(classId).stream().collect(Collectors.groupingBy(TeaEvaluateClassListVo::getId));
                             int size = evaluateCategoryMap.size();
@@ -367,32 +403,37 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                             for (Long id : evaluateCategoryMap.keySet()) {
                                 List<TeaEvaluateClassListVo> evaluateList = evaluateCategoryMap.get(id);
                                 int allSorce = evaluateList.stream().mapToInt(TeaEvaluateClassListVo::getScore).sum();
-                                double avgScore = BigDecimal.valueOf(allSorce).divide(BigDecimal.valueOf(resultList.size())).setScale(2, RoundingMode.HALF_UP).doubleValue();
+                                double avgScore = BigDecimal.valueOf(allSorce).divide(BigDecimal.valueOf(resultList.size()),2, RoundingMode.HALF_UP).doubleValue();
                                 evaluateSocreList.add(avgScore);
                             }
 
                             double sum = evaluateSocreList.stream().mapToDouble(Double::doubleValue).sum();
                             double jskhValue = BigDecimal.valueOf(sum).divide(BigDecimal.valueOf(size),2, RoundingMode.HALF_UP).doubleValue();
-                            c.setTeacherAssessComprehensiveIndex(jskhValue);
+                            c.setTeacherAssessComprehensiveIndex(jskhValue + "");
                             String replacedExpression = jskhFormula.replace("JSKH", Double.toString(jskhValue));
 
                             ScriptEngineManager manager = new ScriptEngineManager();
                             ScriptEngine engine = manager.getEngineByName("JavaScript");
                             try {
                                 double result = ((Number) engine.eval(replacedExpression)).doubleValue();
-                                c.setTeacherAssessScore(result);
+                                c.setTeacherAssessScore(result + " ");
                             } catch (ScriptException e) {
                                 Log.error(e.getMessage(), e);
                             }
                         }
+
+                        c.setMilitaryManageScore(" ");
+                        c.setMilitaryManageComprehensiveIndex(" ");
+                        c.setAssessMoney(" ");
+                        c.setAssessSumScore(" ");
                     }
                 }
                 //sheet名
                 String sheetName = "量化考核总表";
 
-//                WriteSheet writeSheet = EasyExcel.writerSheet(0, sheetName ).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet(0, sheetName ).build();
 //
-//                excelWriter.write(resultList, writeSheet);
+                excelWriter.write(resultList, writeSheet);
             }
             /*for (BaseStudentAssessmentCategory bsac : baseStudentAssessmentCategorieList) {
                 dto.setBaseStudentAssessmentCategoryId(bsac.getId());
@@ -434,8 +475,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                 .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();
+                .like(dto.getName() != null && !dto.getName().equals(""), XjrUser::getName, dto.getName());
 
         IPage<CalssQuantitativeAssessmentPageVo> resultPage = baseClassMapper.selectJoinPage(page, CalssQuantitativeAssessmentPageVo.class, baseClassMPJLambdaWrapper);
 
@@ -498,41 +538,35 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
             for(CalssQuantitativeAssessmentPageVo c: resultPage.getRecords()){
                 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);
-                    /* ScriptEngine engine = new ScriptEngineManager().getEngineByName("js");
-                    String geRenXingWeiGongShi = "sumSubScore/itemCount";
-                    int totalScore = scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateSubmitRecordId()).getTotalScore();
-                    int itemCount = scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateSubmitRecordId()).getItemCount();
-                    double res = 0;
-                    String newStr1 = zonghezhishu.replace("totalScore", ""+totalScore);
-                    String newStr2 = newStr1.replace("itemCount", ""+itemCount);
-                    try{
-                        res = Double.parseDouble(engine.eval(newStr2).toString());
-                    }catch (ScriptException s){
-
-                    }
-                    // 创建一个DecimalFormat对象，指定小数位数为两位
-                    DecimalFormat decimalFormat = new DecimalFormat("#.00");
-                    // 格式化double值为字符串
-                    String formattedNumber = decimalFormat.format(res);*/
+                    c.setStuPersonalBehaviorSubScore(individualBehaviorMap.get(classId).getSumScore()==null?"":individualBehaviorMap.get(classId).getSumScore().toString());
+                    double v = (100 + individualBehaviorMap.get(classId).getSumScore()) / 100 * 25;
+                    c.setStuPersonalBehaviorScore(v + "");
                 }
 
                 if(conventionalManagementMap.get(classId) != null){
-                    c.setClassConventionalManageSubScore(conventionalManagementMap.get(classId).getSumScore());
-                    Double SumScore = 0D;
-                    if(conventionalManagementMap.get(classId).getSumScore() != null){
-                        SumScore = conventionalManagementMap.get(classId).getSumScore();
+                    Double sumScore = conventionalManagementMap.get(classId).getSumScore();
+                    if(sumScore != null){
+                        String scoreStr = sumScore.toString();
+//                    boolean isInteger = sumScore == Math.floor(sumScore);
+//                    if(isInteger){
+//                        scoreStr = sumScore.intValue() + "";
+//                    }
+                        c.setClassConventionalManageSubScore(scoreStr);
+
+                        double v = (100 + sumScore) / 100 * 25;
+                        c.setClassConventionalManageScore(v + "");
                     }
-                    c.setClassConventionalManageScore((100 + SumScore)/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);
+                    Double sumScore = awardsAndHonorableMap.get(classId).getSumScore();
+                    if(sumScore != null){
+                        c.setHonorSumScore(sumScore.toString());
+                        if(sumScore < 10){
+                            c.setHonorScore(sumScore.toString());
+                        }else {
+                            c.setHonorScore("10");
+                        }
                     }
                 }
 
@@ -548,14 +582,14 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                     }
                     double sum = evaluateSocreList.stream().mapToDouble(Double::doubleValue).sum();
                     double jskhValue = BigDecimal.valueOf(sum).divide(BigDecimal.valueOf(size),2, RoundingMode.HALF_UP).doubleValue();
-                    c.setTeacherAssessComprehensiveIndex(jskhValue);
+                    c.setTeacherAssessComprehensiveIndex(jskhValue + "");
                     String replacedExpression = jskhFormula.replace("JSKH", Double.toString(jskhValue));
 
                     ScriptEngineManager manager = new ScriptEngineManager();
                     ScriptEngine engine = manager.getEngineByName("JavaScript");
                     try {
                         double result = ((Number) engine.eval(replacedExpression)).doubleValue();
-                        c.setTeacherAssessScore(result);
+                        c.setTeacherAssessScore(result + "");
                     } catch (ScriptException e) {
                         Log.error(e.getMessage(), e);
                     }
@@ -717,4 +751,286 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
         weChatService.sendTemplateMessage(weChatSendMessageDto);
         return true;
     }
+
+    @Override
+    public byte[] getExcelByte(CalssQuantitativeAssessmentPageDto dto) throws IOException {
+        IPage<CalssQuantitativeAssessmentPageVo> page = this.getCalssQuantitativeAssessmentPage(new Page<>(1, 10000), dto);
+
+        Workbook workbook = new XSSFWorkbook();
+        // 创建一个工作表(sheet)
+        String sheetName = "数据";
+        Sheet sheet = workbook.createSheet(sheetName);
+        createFirstTitle(workbook, sheet);
+        createSecondTitle(workbook, sheet, 6);
+
+        Font font = workbook.createFont();
+        font.setBold(false);// 设置为粗体
+        font.setFontName("宋体");
+        CellStyle cellStyle = workbook.createCellStyle();
+        cellStyle.setFont(font); // 将字体应用到样式
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+
+        int sortCode = 1;
+        for (CalssQuantitativeAssessmentPageVo pageVo : page.getRecords()) {
+            Row dataRow = sheet.createRow(sortCode + 1);
+
+            int columnNumber = 0;
+            Cell cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(sortCode + "");
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getOa());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getClassName());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getHeadTeacherName());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getStudentNum().toString());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getClassStatusCn());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getStuPersonalBehaviorSubScore());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getStuPersonalBehaviorScore());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getClassConventionalManageSubScore());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getClassConventionalManageScore());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getHonorSumScore());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getHonorScore());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getMilitaryManageComprehensiveIndex());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getMilitaryManageScore());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getTeacherAssessComprehensiveIndex());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getTeacherAssessScore());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getAssessSumScore());
+            cell.setCellStyle(cellStyle);
+
+            columnNumber ++;
+            cell = dataRow.createCell(columnNumber);
+            cell.setCellValue(pageVo.getAssessMoney());
+            cell.setCellStyle(cellStyle);
+
+            sortCode ++;
+        }
+
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        workbook.write(bot);
+        return bot.toByteArray();
+    }
+
+    void createFirstTitle(Workbook workbook, Sheet sheet) {
+        int rowNumber = 0;
+        Font font = workbook.createFont();
+        font.setFontName("宋体");
+        //font.setColor(IndexedColors.RED.getIndex()); // 设置字体颜色为红色
+        font.setFontHeightInPoints((short)12);
+
+        CellStyle cellStyle = workbook.createCellStyle();
+        cellStyle.setFont(font); // 将字体应用到样式
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+
+        Row row = sheet.createRow(rowNumber);
+        //3、处理表头
+        int columnNumber = 0;
+        Cell cell = row.createCell(columnNumber);
+        cell.setCellValue("序号");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, columnNumber, columnNumber));
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("工号");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, columnNumber, columnNumber));
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("班级");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, columnNumber, columnNumber));
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("班主任");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, columnNumber, columnNumber));
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("人数");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, columnNumber, columnNumber));
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("状态");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, columnNumber, columnNumber));
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("学生个人行为");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, columnNumber, columnNumber + 1));
+        columnNumber ++;
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("常规管理");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, columnNumber, columnNumber + 1));
+        columnNumber ++;
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("获奖及荣誉奖章");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, columnNumber, columnNumber + 1));
+        columnNumber ++;
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("准军事化管理效果");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, columnNumber, columnNumber + 1));
+        columnNumber ++;
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("任课教师考核");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, columnNumber, columnNumber + 1));
+        columnNumber ++;
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("月份总得分");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, columnNumber, columnNumber));
+
+        columnNumber ++;
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("月考核金额");
+        cell.setCellStyle(cellStyle);
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, columnNumber, columnNumber));
+    }
+
+    void createSecondTitle(Workbook workbook, Sheet sheet, int startColunm) {
+        int rowNumber = 1;
+        Font font = workbook.createFont();
+        font.setFontName("宋体");
+        font.setFontHeightInPoints((short)12);
+
+        CellStyle cellStyle = workbook.createCellStyle();
+        cellStyle.setFont(font); // 将字体应用到样式
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+
+        Row row = sheet.createRow(rowNumber);
+
+        int columnNumber = startColunm;
+        Cell cell = row.createCell(columnNumber);
+        cell.setCellValue("扣分");
+        cell.setCellStyle(cellStyle);
+        columnNumber ++;
+
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("此项得分");
+        cell.setCellStyle(cellStyle);
+        columnNumber ++;
+
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("扣分");
+        cell.setCellStyle(cellStyle);
+        columnNumber ++;
+
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("此项得分");
+        cell.setCellStyle(cellStyle);
+        columnNumber ++;
+
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("扣分");
+        cell.setCellStyle(cellStyle);
+        columnNumber ++;
+
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("此项得分");
+        cell.setCellStyle(cellStyle);
+        columnNumber ++;
+
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("扣分");
+        cell.setCellStyle(cellStyle);
+        columnNumber ++;
+
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("此项得分");
+        cell.setCellStyle(cellStyle);
+        columnNumber ++;
+
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("扣分");
+        cell.setCellStyle(cellStyle);
+        columnNumber ++;
+
+        cell = row.createCell(columnNumber);
+        cell.setCellValue("此项得分");
+        cell.setCellStyle(cellStyle);
+    }
 }

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

@@ -54,60 +54,60 @@ public class CalssQuantitativeAssessmentPageVo {
     @ApiModelProperty("学生个人行为扣分")
     @ExcelProperty(value = "学生个人行为扣分")
     @ColumnWidth(10)
-    private Double stuPersonalBehaviorSubScore;
+    private String stuPersonalBehaviorSubScore;
 
     @ApiModelProperty("学生个人行为得分")
     @ExcelProperty(value = "学生个人行为得分")
     @ColumnWidth(10)
-    private Double stuPersonalBehaviorScore;
+    private String stuPersonalBehaviorScore;
 
     @ApiModelProperty("常规管理扣分")
     @ExcelProperty(value = "常规管理扣分")
     @ColumnWidth(10)
-    private Double classConventionalManageSubScore;
+    private String classConventionalManageSubScore;
 
     @ApiModelProperty("常规管理得分")
     @ExcelProperty(value = "常规管理得分")
     @ColumnWidth(10)
-    private Double classConventionalManageScore;
+    private String classConventionalManageScore;
 
     @ApiModelProperty("获奖及荣誉表彰汇总")
     @ExcelProperty(value = "获奖及荣誉表彰汇总")
     @ColumnWidth(10)
-    private Double honorSumScore;
+    private String honorSumScore;
 
     @ApiModelProperty("获奖及荣誉表彰得分")
     @ExcelProperty(value = "获奖及荣誉表彰得分")
     @ColumnWidth(10)
-    private Double honorScore;
+    private String honorScore;
 
     @ApiModelProperty("准军事化管理效果综合指数")
     @ExcelProperty(value = "准军事化管理效果综合指数")
     @ColumnWidth(10)
-    private Double militaryManageComprehensiveIndex;
+    private String militaryManageComprehensiveIndex;
 
     @ApiModelProperty("准军事化管理效果得分")
     @ExcelProperty(value = "准军事化管理效果得分")
     @ColumnWidth(10)
-    private Double militaryManageScore;
+    private String militaryManageScore;
 
     @ApiModelProperty("任课教师考核综合指数")
     @ExcelProperty(value = "任课教师考核综合指数")
     @ColumnWidth(10)
-    private Double teacherAssessComprehensiveIndex;
+    private String teacherAssessComprehensiveIndex;
 
     @ApiModelProperty("任课教师考核得分")
     @ExcelProperty(value = "任课教师考核得分")
     @ColumnWidth(10)
-    private Double teacherAssessScore;
+    private String teacherAssessScore;
 
     @ApiModelProperty("考核总得分")
     @ExcelProperty(value = "考核总得分")
     @ColumnWidth(10)
-    private Double assessSumScore;
+    private String assessSumScore;
 
     @ApiModelProperty("考核金额")
     @ExcelProperty(value = "考核金额")
     @ColumnWidth(10)
-    private Double assessMoney;
+    private String assessMoney;
 }

src/main/java/com/xjrsoft/module/system/controller/XjrMenuGroupSetController.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.system.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.RT;
@@ -8,19 +9,25 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.system.dto.AddXjrMenuGroupDto;
+import com.xjrsoft.module.system.dto.AddXjrMenuGroupSetDto;
+import com.xjrsoft.module.system.dto.UpdateXjrMenuGroupSetDto;
 import com.xjrsoft.module.system.dto.XjrMenuGroupMenuListDto;
 import com.xjrsoft.module.system.dto.XjrMenuGroupSetPageDto;
 import com.xjrsoft.module.system.entity.XjrMenuGroupSet;
 import com.xjrsoft.module.system.service.IXjrMenuGroupSetService;
 import com.xjrsoft.module.system.vo.XjrMenuGroupMenuListVo;
 import com.xjrsoft.module.system.vo.XjrMenuGroupSetPageVo;
+import com.xjrsoft.module.system.vo.XjrMenuGroupSetVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -55,41 +62,41 @@ public class XjrMenuGroupSetController {
         return RT.ok(pageOutput);
     }
 
-//    @GetMapping(value = "/info")
-//    @ApiOperation(value="根据id查询功能分类设置信息")
-//    @SaCheckPermission("xjrmenugroupset:detail")
-//    public RT<XjrMenuGroupSetVo> info(@RequestParam Long id){
-//        XjrMenuGroupSet xjrMenuGroupSet = xjrMenuGroupSetService.getByIdDeep(id);
-//        if (xjrMenuGroupSet == null) {
-//           return RT.error("找不到此数据！");
-//        }
-//        return RT.ok(BeanUtil.toBean(xjrMenuGroupSet, XjrMenuGroupSetVo.class));
-//    }
-//
-//
-//    @PostMapping
-//    @ApiOperation(value = "新增功能分类设置")
-//    @SaCheckPermission("xjrmenugroupset:add")
-//    public RT<Boolean> add(@Valid @RequestBody AddXjrMenuGroupSetDto dto){
-//        XjrMenuGroupSet xjrMenuGroupSet = BeanUtil.toBean(dto, XjrMenuGroupSet.class);
-//        boolean isSuccess = xjrMenuGroupSetService.add(xjrMenuGroupSet);
-//        return RT.ok(isSuccess);
-//    }
-//
-//    @PutMapping
-//    @ApiOperation(value = "修改功能分类设置")
-//    @SaCheckPermission("xjrmenugroupset:edit")
-//    public RT<Boolean> update(@Valid @RequestBody UpdateXjrMenuGroupSetDto dto){
-//        XjrMenuGroupSet xjrMenuGroupSet = BeanUtil.toBean(dto, XjrMenuGroupSet.class);
-//        return RT.ok(xjrMenuGroupSetService.update(xjrMenuGroupSet));
-//    }
-//
-//    @DeleteMapping
-//    @ApiOperation(value = "删除功能分类设置")
-//    @SaCheckPermission("xjrmenugroupset:delete")
-//    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
-//        return RT.ok(xjrMenuGroupSetService.delete(ids));
-//    }
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询功能分类设置信息")
+    @SaCheckPermission("xjrmenugroupset:detail")
+    public RT<XjrMenuGroupSetVo> info(@RequestParam Long id){
+        XjrMenuGroupSet xjrMenuGroupSet = xjrMenuGroupSetService.getByIdDeep(id);
+        if (xjrMenuGroupSet == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(xjrMenuGroupSet, XjrMenuGroupSetVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增功能分类设置")
+    @SaCheckPermission("xjrmenugroupset:add")
+    public RT<Boolean> add(@Valid @RequestBody AddXjrMenuGroupSetDto dto){
+        XjrMenuGroupSet xjrMenuGroupSet = BeanUtil.toBean(dto, XjrMenuGroupSet.class);
+        boolean isSuccess = xjrMenuGroupSetService.add(xjrMenuGroupSet);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改功能分类设置")
+    @SaCheckPermission("xjrmenugroupset:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateXjrMenuGroupSetDto dto){
+        XjrMenuGroupSet xjrMenuGroupSet = BeanUtil.toBean(dto, XjrMenuGroupSet.class);
+        return RT.ok(xjrMenuGroupSetService.update(xjrMenuGroupSet));
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除功能分类设置")
+    @SaCheckPermission("xjrmenugroupset:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(xjrMenuGroupSetService.delete(ids));
+    }
 
     @GetMapping(value = "/menu-list")
     @ApiOperation(value = "查询学生菜单")

src/main/java/com/xjrsoft/module/system/dto/AddXjrMenuGroupSetDto.java

@@ -40,4 +40,7 @@ public class AddXjrMenuGroupSetDto implements Serializable {
     */
     @ApiModelProperty("xjrMenuGroup子表")
     private List<AddXjrMenuGroupDto> xjrMenuGroupList;
+
+    @ApiModelProperty("角色id")
+    private Long roleId;
 }

src/main/java/com/xjrsoft/module/system/entity/XjrMenuGroupSet.java

@@ -95,4 +95,7 @@ public class XjrMenuGroupSet implements Serializable {
     @EntityMapping(thisField = "id", joinField = "xjrMenuGroupSetId")
     private List<XjrMenuGroup> xjrMenuGroupList;
 
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
 }

src/main/java/com/xjrsoft/module/system/vo/XjrMenuGroupSetPageVo.java

@@ -65,4 +65,7 @@ public class XjrMenuGroupSetPageVo {
     @ApiModelProperty("使用范围(1:全部学生 2:白名单学生)")
     private Integer useRange;
 
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
 }

src/main/java/com/xjrsoft/module/system/vo/XjrMenuGroupSetVo.java

@@ -42,4 +42,7 @@ public class XjrMenuGroupSetVo {
     @ApiModelProperty("xjrMenuGroup子表")
     private List<XjrMenuGroupVo> xjrMenuGroupList;
 
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
 }