学生成绩录入

src/main/java/com/xjrsoft/module/veb/util/ImportExcelUtil.java

@@ -388,7 +388,7 @@ public class ImportExcelUtil {
             field.setAccessible(true); // 访问私有字段
             if (field.isAnnotationPresent(Required.class)) {
                 Required required = field.getAnnotation(Required.class);
-                Boolean value = required.value();
+                boolean value = required.value();
                 importConfig.setRequired(value);
             }
 

src/main/java/com/xjrsoft/module/xycxedu/controller/ExamPlanController.java

@@ -76,7 +76,7 @@ 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){
+            if(StrUtil.isEmpty(record.getMilexamids())){
                 continue;
             }
             String[] split = record.getMilexamids().split(",");

src/main/java/com/xjrsoft/module/xycxedu/service/impl/ExamSubjectScoreEnterServiceImpl.java

@@ -185,8 +185,8 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
             data.add(recordVo.getCredentialNumber());
             data.add(courseSubject.getName());
             data.add(recordVo.getScore());
-            data.add(recordVo.getClassRanking() + "");
-            data.add(recordVo.getGradeRanking() + "");
+            data.add(recordVo.getClassRanking()==null?"":recordVo.getClassRanking() + "");
+            data.add(recordVo.getGradeRanking()==null?"":recordVo.getGradeRanking() + "");
             dataList.add(data);
         }
 
@@ -305,7 +305,7 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
             ImportConfig importConfig = list.get(i);
             Cell rowcell = row1.createCell(i);
             rowcell.setCellValue(importConfig.getLabel());
-            if(importConfig.getRequired()){
+            if(importConfig.getRequired() != null && importConfig.getRequired()){
                 rowcell.setCellStyle(cellStyle2);
             }else{
                 rowcell.setCellStyle(cellStyle);

src/main/resources/mapper/xycxedu/ExamSubjectScoreMappper.xml

@@ -11,7 +11,7 @@
 
     <select id="getPage" parameterType="com.xjrsoft.module.xycxedu.dto.ExamSubjectScoreDto" resultType="com.xjrsoft.module.xycxedu.vo.ExamSubjectScorePageVo">
         SELECT t4.name AS semester_name,t2.milexamname,t1.coursename,t1.score,t1.grade_ranking FROM exam_subject_score t1
-        INNER JOIN xycxedu_exam_list t2 ON t1.milexamid = t2.milexamid
+        LEFT JOIN xycxedu_exam_list t2 ON t1.milexamid = t2.milexamid
         LEFT JOIN exam_plan t3 ON t3.milexamids LIKE CONCAT('%', t1.milexamid, '%')
         LEFT JOIN base_semester t4 ON t3.semester_id = t4.id
         WHERE t1.delete_mark = 0 AND t1.user_id = #{dto.userId}