瀏覽代碼

学生成绩录入

dzx 11 月之前
父節點
當前提交
ba89f68aaf

+ 3 - 0
src/main/java/com/xjrsoft/module/xycxedu/controller/ExamPlanController.java

@@ -76,6 +76,9 @@ public class ExamPlanController {
         IPage<ExamPlanPageVo> page = examPlanService.selectJoinListPage(ConventPage.getPage(dto), ExamPlanPageVo.class, queryWrapper);
         PageOutput<ExamPlanPageVo> pageOutput = ConventPage.getPageOutput(page, ExamPlanPageVo.class);
         for (ExamPlanPageVo record : pageOutput.getList()) {
+            if(record.getMilexamids() == null){
+                continue;
+            }
             String[] split = record.getMilexamids().split(",");
             List<Long> milexamids = Arrays.asList(split).stream()
                     .map(Long::parseLong)

+ 12 - 1
src/main/java/com/xjrsoft/module/xycxedu/service/impl/ExamSubjectScoreEnterServiceImpl.java

@@ -290,6 +290,13 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
         cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
         cellStyle.setAlignment(HorizontalAlignment.CENTER);
 
+        font.setColor(IndexedColors.RED.getIndex()); // 设置字体颜色为红色
+        CellStyle cellStyle2 = workbook.createCellStyle();
+        cellStyle2.setFont(font); // 将字体应用到样式
+        cellStyle2.setVerticalAlignment(VerticalAlignment.CENTER);
+        cellStyle2.setAlignment(HorizontalAlignment.CENTER);
+        cellStyle2.setFillBackgroundColor(IndexedColors.YELLOW.getIndex());
+
 
         Row row1 = sheet.createRow(rowNumber);
         List<ImportConfig> importConfigs = ImportExcelUtil.getAllFieldCN(clazz);
@@ -298,7 +305,11 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
             ImportConfig importConfig = list.get(i);
             Cell rowcell = row1.createCell(i);
             rowcell.setCellValue(importConfig.getLabel());
-            rowcell.setCellStyle(cellStyle);
+            if(importConfig.getRequired()){
+                rowcell.setCellStyle(cellStyle2);
+            }else{
+                rowcell.setCellStyle(cellStyle);
+            }
         }
     }
 }

+ 5 - 0
src/main/java/com/xjrsoft/module/xycxedu/vo/ExamSubjectScoreEnterImportVo.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.xycxedu.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.xjrsoft.common.annotation.Required;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -22,18 +23,22 @@ public class ExamSubjectScoreEnterImportVo{
 
     @ExcelProperty("班级")
     @ApiModelProperty("班级")
+    @Required
     private String className;
 
     @ExcelProperty("学生姓名")
     @ApiModelProperty("学生姓名")
+    @Required
     private String studentName;
 
     @ExcelProperty("学生身份证")
     @ApiModelProperty("学生身份证")
+    @Required
     private String credentialNumber;
 
     @ExcelProperty("成绩")
     @ApiModelProperty("成绩")
+    @Required
     private String score;
 
     @ExcelProperty("班级排名")

+ 1 - 1
src/main/resources/mapper/xycxedu/ExamSubjectScoreEnterMappper.xml

@@ -28,7 +28,7 @@
     <select id="getInfo" resultType="com.xjrsoft.module.xycxedu.vo.ExamSubjectScoreEnterVo">
         SELECT t1.id, t2.name AS semester_name,t3.name AS exam_plan_name,t4.name AS course_subject_name,t1.create_date,t5.name create_user_name,t1.class_ids
         ,(SELECT GROUP_CONCAT(NAME) FROM base_class WHERE t1.class_ids LIKE CONCAT('%', id, '%')) AS class_name
-        ,(SELECT COUNT(*) FROM exam_subject_score WHERE delete_mark = 0 AND exam_subject_score_enter_id = t1.id AND enabled_mark = 1 AND score IS NULL) AS all_count
+        ,(SELECT COUNT(*) FROM exam_subject_score WHERE delete_mark = 0 AND exam_subject_score_enter_id = t1.id AND enabled_mark = 1) AS all_count
         ,(SELECT COUNT(*) FROM exam_subject_score WHERE delete_mark = 0 AND exam_subject_score_enter_id = t1.id AND enabled_mark = 1 AND score IS NOT NULL) AS handle_count
         FROM exam_subject_score_enter t1
         LEFT JOIN base_semester t2 ON t1.semester_id = t2.id