班级考核查询调整

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

@@ -120,7 +120,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
     public BaseStudentAssessmentInspectionVo getInfo(Long id) {
         BaseStudentAssessmentInspectionVo result = assessmentInspectionMapper.getInfo(id);
         // 处理加减分
-        if (result.getScoreType().equals(ScoreTypeEnum.ScoreMinus.getCode())) {
+        if (result.getScoreType() != null && result.getScoreType().equals(ScoreTypeEnum.ScoreMinus.getCode())) {
             result.setScore(result.getScore() * -1);
         }
 

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

@@ -56,7 +56,7 @@
         left join xjr_user t5 on t.assessment_user_id=t5.id
         left join xjr_dictionary_detail t6 on t6.code=t.score_type
         left join xjr_user t7 on t.create_user_id=t7.id
-        where t.id=#{id} and t.delete_mark=0 and t1.delete_mark=0  and t2.delete_mark=0  and t3.delete_mark=0 and t.status=1;
+        where t.id=#{id} and t.delete_mark=0 and t1.delete_mark=0  and t2.delete_mark=0  and t3.delete_mark=0;
     </select>
 
     <select id="getMobilePage" parameterType="com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo">
@@ -72,7 +72,7 @@
         left join base_student_assessment_project t3 on (t3.id = t1.base_student_assessment_project_id)
         left join xjr_dictionary_detail t4 on t4.code=t1.score_type
         left join base_class t5 on t5.id=t.class_id
-        where t1.delete_mark=0 and t1.status=1 and t.class_id in
+        where t1.delete_mark = 0 and t.class_id in
         <foreach item="classId" index="index" collection="dto.classIds" open="(" close=")" separator=",">
             #{classId}
         </foreach>