评价模块调整

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

@@ -537,8 +537,6 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
 
                 if(classEvaluateMap.containsKey(classId)){
                     Map<Long, List<TeaEvaluateClassListVo>> evaluateCategoryMap = classEvaluateMap.get(classId).stream().collect(Collectors.groupingBy(TeaEvaluateClassListVo::getId));
-                    int evaluateItemSize = evaluateCategoryMap.size();
-
                     List<Double> evaluateSocreList = new ArrayList<>();//存每个项的平均分
                     for (Long id : evaluateCategoryMap.keySet()) {
                         List<TeaEvaluateClassListVo> resultList = evaluateCategoryMap.get(id);

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

@@ -190,12 +190,13 @@
     </select>
 
     <select id="getTeaEvaluateClassList" parameterType="com.xjrsoft.module.evaluate.dto.TeaEvaluateClassDto" resultType="com.xjrsoft.module.evaluate.vo.TeaEvaluateClassListVo">
-        SELECT t2.evaluate_item_id, t2.problem,t1.score,t1.user_id,t1.evaluated_object_id FROM evaluate_result t1
+        SELECT t2.evaluate_item_id as id, t2.problem,t1.score,t1.user_id,t5.object_id as evaluated_object_id FROM evaluate_result t1
         INNER JOIN evaluate_manage_item t2 ON t1.evaluate_item_id = t2.id
         INNER JOIN evaluate_manage t3 ON t3.id = t2.evaluate_manage_id
         INNER JOIN evaluate_template t4 ON t3.evaluate_template_id = t4.id
+        inner join evaluate_object t5 on t1.evaluated_object_id = t5.id
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0 AND t3.delete_mark = 0
-        AND t4.delete_mark = 0
+        AND t4.delete_mark = 0 AND t5.delete_mark = 0
         AND t3.year = #{dto.year}
         AND t3.month = #{dto.month}
         AND t4.evaluate_type = #{dto.evaluateType}