评价做题移动端

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateResultServiceImpl.java

@@ -90,7 +90,7 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
                 .disableSubLogicDel();
         IPage<ResultViewingPageVo> resultViewingPageVoIPage = evaluateObjectMapper.selectJoinPage(ConventPage.getPage(dto), ResultViewingPageVo.class, evaluateObjectMPJLambdaWrapper);
 
-        //获取该评价管理下的题目-多个
+        //获取该评价管理下的所有题目-多个
         MPJLambdaWrapper<EvaluateManageItem> evaluateManageItemMPJLambdaWrapper = new MPJLambdaWrapper<>();
         evaluateManageItemMPJLambdaWrapper
                 .eq(EvaluateManageItem::getEvaluateManageId, dto.getEvaluateManageId());
@@ -108,7 +108,30 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
                     .disableSubLogicDel();
             ResultViewingPageVo planAndActualExecuterNum = evaluateExecuterMapper.selectJoinOne(ResultViewingPageVo.class, evaluateExecuterMPJLambdaWrapper);
 
-            for (EvaluateManageItem evaluateManageItem : evaluateManageItemList) {
+            //获取该评价管理下的单个被评对象的所有题的总得分
+//            MPJLambdaWrapper<EvaluateResult> evaluateResultMPJLambdaWrapper = new MPJLambdaWrapper<>();
+//            evaluateResultMPJLambdaWrapper
+//                    .selectSum(EvaluateResult::getScore, ResultViewingPageVo::getSumScore)
+//                    .leftJoin(EvaluateObject.class, EvaluateObject::getId, EvaluateResult::getEvaluatedObjectId)
+//                    .eq(EvaluateResult::getEvaluateItemId, evaluateManageItem.getId())
+//                    .eq(EvaluateObject::getObjectId, resultViewingPageVo.getObjectId())
+//                    .disableSubLogicDel();
+//            ResultViewingPageVo sumScore = evaluateResultMapper.selectJoinOne(ResultViewingPageVo.class, evaluateResultMPJLambdaWrapper);
+//            resultData.add(new ResultViewingPageVo() {{
+//                setObjectId(resultViewingPageVo.getObjectId());
+//                setObjectIdCN(resultViewingPageVo.getObjectIdCN());
+//                setEvaluateManageItemId(evaluateManageItem.getId());
+//                setProblem(evaluateManageItem.getProblem());
+//                setTopic(evaluateManageItem.getTopic());
+//                if (planAndActualExecuterNum != null) {
+//                    setPlanExecuterNum(planAndActualExecuterNum.getPlanExecuterNum());
+//                    setActualExecuterNum(planAndActualExecuterNum.getActualExecuterNum());
+//                }
+//                if (sumScore != null) {
+//                    setSumScore(sumScore.getSumScore());
+//                }
+
+            /*for (EvaluateManageItem evaluateManageItem : evaluateManageItemList) {
                 //获取该评价管理下的单个被评对象的每一道题的总得分
                 MPJLambdaWrapper<EvaluateResult> evaluateResultMPJLambdaWrapper = new MPJLambdaWrapper<>();
                 evaluateResultMPJLambdaWrapper
@@ -118,6 +141,7 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
                         .eq(EvaluateObject::getObjectId, resultViewingPageVo.getObjectId())
                         .disableSubLogicDel();
                 ResultViewingPageVo sumScore = evaluateResultMapper.selectJoinOne(ResultViewingPageVo.class, evaluateResultMPJLambdaWrapper);
+
                 resultData.add(new ResultViewingPageVo() {{
                     setObjectId(resultViewingPageVo.getObjectId());
                     setObjectIdCN(resultViewingPageVo.getObjectIdCN());
@@ -132,7 +156,7 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
                         setSumScore(sumScore.getSumScore());
                     }
                 }});
-            }
+            }*/
         }
 
         resultViewingPageVoIPage.setRecords(resultData);

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

@@ -45,6 +45,7 @@
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0 AND t1.status = 1
         and t2.status = #{dto.status} and t2.user_id = #{dto.loginUserId}
     </select>
+
     <select id="getWriteInfo" parameterType="com.xjrsoft.module.evaluate.dto.EvaluateWritePageDto" resultType="com.xjrsoft.module.evaluate.vo.EvaluateWriteVo">
         select t1.id, t1.name,t1.start_time,t1.end_time,
         (SELECT COUNT(*) FROM evaluate_manage_item WHERE enabled_mark = 0 AND evaluate_item_id = t1.id) AS item_count
@@ -57,15 +58,16 @@
         SELECT * FROM evaluate_manage_item WHERE delete_mark = 0 AND evaluate_manage_id = #{id} ORDER BY sort_code
     </select>
     <select id="getResultList" resultType="com.xjrsoft.module.evaluate.vo.EvaluateManageItemVo">
-        SELECT t1.id,t1.sort_code,t1.evaluate_manage_id,t1.topic,t1.problem,t1.score,t2.score AS actul_score,t2.opinion,t1.input_not_null FROM evaluate_manage_item t1
+        SELECT t1.id,t1.sort_code,t1.evaluate_manage_id,t1.topic,t1.problem,t1.score,t2.score AS actualScore,t2.opinion,t1.input_not_null FROM evaluate_manage_item t1
         LEFT JOIN evaluate_result t2 ON t1.id = t2.evaluate_item_id
+        LEFT JOIN evaluate_executer t3 ON t3.id = t2.user_id
         WHERE t1.delete_mark = 0
         AND t2.delete_mark = 0
         AND t1.evaluate_manage_id = #{id}
-        AND t2.user_id = #{userId}
+        AND t3.user_id = #{userId}
         ORDER BY t1.sort_code
     </select>
-    <select id="getScoreList" resultType="com.xjrsoft.module.evaluate.vo.EvaluateManageItemVo">
+    <select id="getScoreList" resultType="com.xjrsoft.module.evaluate.vo.EvaluateManageScoreVo">
         select t2.evaluate_manage_id,sum(t1.score) from evaluate_result t1
         left join evaluate_manage_item t2 on t1.evaluate_item_id = t2.id
         left join evaluate_executer t3 on t1.user_id = t3.id