学生成绩录入

src/main/java/com/xjrsoft/module/xycxedu/entity/ExamSubjectScore.java

@@ -97,4 +97,7 @@ public class ExamSubjectScore implements Serializable {
     @ApiModelProperty("录入id")
     private Long examSubjectScoreEnterId;
 
+    @ApiModelProperty("考试计划id")
+    private Long examPlanId;
+
 }

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

@@ -152,6 +152,7 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
                         setSemesterId(examSubjectScoreEnter.getSemesterId());
                         setCourseSubjectId(examSubjectScoreEnter.getCourseSubjectId());
                         setCoursename(examSubjectScoreEnter.getCoursename());
+                        setExamPlanId(examSubjectScoreEnter.getExamPlanId());
                     }}
             );
         }

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

@@ -12,7 +12,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,t1.class_ranking FROM exam_subject_score t1
         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 exam_plan t3 ON (t3.milexamids LIKE CONCAT('%', t1.milexamid, '%') or t1.exam_plan_id = t3.id)
         LEFT JOIN base_semester t4 ON t3.semester_id = t4.id
         WHERE t1.delete_mark = 0 AND t1.user_id = #{dto.userId}
         <if test="dto.semesterId != null">