评价管理调整

src/main/resources/mapper/evaluate/EvaluateResultMapper.xml

@@ -51,7 +51,7 @@
         t.status,
         ifnull(t5.comprehensiveScore, 0) as comprehensiveScore
         from evaluate_executer t
-        left join evaluate_object t3 on t3.id = t.evaluate_object_id
+        inner join evaluate_object t3 on t3.id = t.evaluate_object_id
         left join xjr_user t1 on t1.id = t3.object_id
         left join base_class t2 on t2.id = t3.object_id
         left join xjr_user t4 on t4.id = t.user_id
@@ -60,6 +60,8 @@
         from evaluate_result t
         group by t.evaluated_object_id, t.user_id) t5 on t5.evaluated_object_id = t.evaluate_object_id and t5.user_id = t.id
         where t.evaluate_manage_id = #{dto.evaluateManageId}
+        AND t3.delete_mark = 0
+        AND t.delete_mark = 0
         <if test="dto.baseGradeId != null and dto.baseGradeId > 0">
             AND t3.base_grade_id = #{dto.baseGradeId}
         </if>