评价结果调整

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateManageController.java

@@ -110,7 +110,7 @@ public class EvaluateManageController {
         if(dto.getStatus() == 2){
             return RT.ok(evaluateManageService.updateById(new EvaluateManage(){{
                 setId(dto.getId());
-                setCreateDate(new Date());
+                setEndTime(new Date());
                 setCreateUserId(StpUtil.getLoginIdAsLong());
                 setStatus(1);
             }}));

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateResultController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
 * @title: 评价结果
@@ -71,10 +72,9 @@ public class EvaluateResultController {
     @GetMapping(value = "/result-viewing-page")
     @ApiOperation(value="结果查看(分页)")
     @SaCheckPermission("evaluateresult:detail")
-    public RT<PageOutput<ResultViewingPageVo>> pageResultViewing(@Valid ResultViewingPageDto dto){
-        IPage<ResultViewingPageVo> page = evaluateResultService.pageResultViewing(dto);
-        PageOutput<ResultViewingPageVo> pageOutput = ConventPage.getPageOutput(page, ResultViewingPageVo.class);
-        return RT.ok(pageOutput);
+    public RT<List<ResultViewingPageVo>> pageResultViewing(@Valid ResultViewingPageDto dto){
+        List<ResultViewingPageVo> list = evaluateResultService.pageResultViewing(dto);
+        return RT.ok(list);
     }
 
     @PostMapping("/export-query")

src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateResultMapper.java

@@ -11,6 +11,7 @@ import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageDetailList;
 import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageDetailVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateResultIndexPageVo;
+import com.xjrsoft.module.evaluate.vo.ResultViewingListVo;
 import com.xjrsoft.module.evaluate.vo.ResultViewingPageVo;
 import com.xjrsoft.module.evaluate.vo.TeaEvaluateClassListVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -41,4 +42,6 @@ public interface EvaluateResultMapper extends MPJBaseMapper<EvaluateResult> {
     List<ResultViewingPageVo> listSynthesisScore(@Param("evaluateObjectIdList") List<Long> evaluateObjectIdList, @Param("evaluateManageItemIdList") List<Long> evaluateManageItemIdList);
 
     List<TeaEvaluateClassListVo> getTeaEvaluateClassList(@Param("dto") TeaEvaluateClassDto dto);
+
+    List<ResultViewingListVo> getResultViewingList(@Param("evaluateManageId") Long evaluateManageId);
 }

src/main/java/com/xjrsoft/module/evaluate/service/IEvaluateResultService.java

@@ -15,6 +15,8 @@ import com.xjrsoft.module.evaluate.vo.EvaluateResultIndexPageVo;
 import com.xjrsoft.module.evaluate.vo.ResultViewingPageVo;
 import org.springframework.http.ResponseEntity;
 
+import java.util.List;
+
 /**
 * @title: 评价结果
 * @Author szs
@@ -29,7 +31,7 @@ public interface IEvaluateResultService extends MPJBaseService<EvaluateResult> {
 
     EvaluateResultDetailPageDetailVo getDetailPageDetail(EvaluateResultDetailPageDetailDto dto);
 
-    IPage<ResultViewingPageVo> pageResultViewing(ResultViewingPageDto dto);
+    List<ResultViewingPageVo> pageResultViewing(ResultViewingPageDto dto);
 
     String saveBatch(EvaluateResultSaveDto dto);
 

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.merge.LoopMergeStrategy;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -29,7 +28,6 @@ import com.xjrsoft.module.evaluate.entity.EvaluateResult;
 import com.xjrsoft.module.evaluate.entity.EvaluateSubmitRecord;
 import com.xjrsoft.module.evaluate.mapper.EvaluateExecuterMapper;
 import com.xjrsoft.module.evaluate.mapper.EvaluateManageItemMapper;
-import com.xjrsoft.module.evaluate.mapper.EvaluateManageMapper;
 import com.xjrsoft.module.evaluate.mapper.EvaluateObjectMapper;
 import com.xjrsoft.module.evaluate.mapper.EvaluateResultMapper;
 import com.xjrsoft.module.evaluate.mapper.EvaluateSubmitRecordMapper;
@@ -39,6 +37,7 @@ import com.xjrsoft.module.evaluate.vo.EvaluateResultDetailPageVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateResultIndexPageVo;
 import com.xjrsoft.module.evaluate.vo.MobileResultPageVo;
 import com.xjrsoft.module.evaluate.vo.ResultViewingExcelVo;
+import com.xjrsoft.module.evaluate.vo.ResultViewingListVo;
 import com.xjrsoft.module.evaluate.vo.ResultViewingPageVo;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import lombok.AllArgsConstructor;
@@ -47,6 +46,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.ByteArrayOutputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -68,8 +69,6 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
 
     private EvaluateResultMapper evaluateResultMapper;
 
-    private EvaluateManageMapper evaluateManageMapper;
-
     private EvaluateManageItemMapper evaluateManageItemMapper;
 
     private EvaluateSubmitRecordMapper evaluateSubmitRecordMapper;
@@ -104,7 +103,7 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
     }
 
     @Override
-    public IPage<ResultViewingPageVo> pageResultViewing(ResultViewingPageDto dto) {
+    public List<ResultViewingPageVo> pageResultViewing(ResultViewingPageDto dto) {
         List<ResultViewingPageVo> resultData = new ArrayList<>();
         //获取该评价管理下的被评对象-分页
         MPJLambdaWrapper<EvaluateObject> evaluateObjectMPJLambdaWrapper = new MPJLambdaWrapper<>();
@@ -119,10 +118,10 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
                 .eq((dto.getClassId() != null && dto.getClassId() > 0), BaseClass::getId, dto.getClassId())
                 .like((dto.getName() != null && !("").equals(dto.getName())), XjrUser::getName, dto.getName())
                 .disableSubLogicDel();
-        IPage<ResultViewingPageVo> resultViewingPageVoIPage = evaluateObjectMapper.selectJoinPage(ConventPage.getPage(dto), ResultViewingPageVo.class, evaluateObjectMPJLambdaWrapper);
+        List<ResultViewingPageVo> list = evaluateObjectMapper.selectJoinList(ResultViewingPageVo.class, evaluateObjectMPJLambdaWrapper);
         //被评对象的id集合
         List<Long> evaluateObjectIdList = new ArrayList<>();
-        for (ResultViewingPageVo resultViewingPageVo : resultViewingPageVoIPage.getRecords()) {
+        for (ResultViewingPageVo resultViewingPageVo : list) {
             evaluateObjectIdList.add(resultViewingPageVo.getObjectId());
         }
 
@@ -143,20 +142,17 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
         //获取该评价管理下的被评对象的应打分人数，实际打分人数
         MPJLambdaWrapper<EvaluateExecuter> evaluateExecuterMPJLambdaWrapper = new MPJLambdaWrapper<>();
         evaluateExecuterMPJLambdaWrapper
-                .select("count(t.id) as planExecuterNum")
+                .select(EvaluateExecuter::getId)
                 .selectAs(EvaluateObject::getObjectId, ResultViewingPageVo::getObjectId)
-                .selectSum(EvaluateExecuter::getStatus, ResultViewingPageVo::getActualExecuterNum)//这里值得推敲
+                .select(EvaluateExecuter::getStatus)//这里值得推敲
                 .leftJoin(EvaluateObject.class, EvaluateObject::getId, EvaluateExecuter::getEvaluateObjectId)
                 .eq(EvaluateExecuter::getEvaluateManageId, dto.getEvaluateManageId())
                 .in(!evaluateObjectIdList.isEmpty(), EvaluateObject::getObjectId, evaluateObjectIdList)
-                .groupBy(EvaluateObject::getObjectId)
                 .disableSubLogicDel();
         List<ResultViewingPageVo> planAndActualExecuterNum = evaluateExecuterMapper.selectJoinList(ResultViewingPageVo.class, evaluateExecuterMPJLambdaWrapper);
         //将应打分人数，实际打分人数处理成Map
-        Map<Long, ResultViewingPageVo> planAndActualExecuterNumMap = new HashMap<>();
-        for (ResultViewingPageVo resultViewingPageVo : planAndActualExecuterNum) {
-            planAndActualExecuterNumMap.put(resultViewingPageVo.getObjectId(), resultViewingPageVo);
-        }
+        Map<Long, List<ResultViewingPageVo>> planAndActualExecuterNumMap = planAndActualExecuterNum.stream().filter(x -> x.getStatus() == 2).collect(Collectors.groupingBy(ResultViewingPageVo::getObjectId));
+        Map<Long, List<ResultViewingPageVo>> planAndShouldExecuterNumMap = planAndActualExecuterNum.stream().collect(Collectors.groupingBy(ResultViewingPageVo::getObjectId));
 
         Map<Long, List<ResultViewingPageVo>> groupedByObjectIdList = new HashMap<>();
         //获取该评价管理下的所有被评对象的所有题的总得分
@@ -166,123 +162,33 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
             groupedByObjectIdList = listByObjectIdAndEvaluateItemId.stream()
                     .collect(Collectors.groupingBy(ResultViewingPageVo::getObjectId));
 
-            /*MPJLambdaWrapper<EvaluateResult> evaluateResultMPJLambdaWrapper = new MPJLambdaWrapper<>();
-            evaluateResultMPJLambdaWrapper
-                    .selectSum(EvaluateResult::getScore, ResultViewingPageVo::getSumScore)
-                    .selectAs(EvaluateObject::getObjectId, ResultViewingPageVo::getObjectId)
-                    .selectAs(EvaluateResult::getEvaluateItemId, ResultViewingPageVo::getEvaluateManageItemId)
-                    .leftJoin(EvaluateObject.class, EvaluateObject::getId, EvaluateResult::getEvaluatedObjectId)
-                    .in(EvaluateObject::getObjectId, evaluateObjectIdList)
-                    .in(EvaluateResult::getEvaluateItemId, evaluateManageItemIdList)
-                    .groupBy(EvaluateResult::getEvaluateItemId, EvaluateObject::getEvaluateManageId)
-                    .disableSubLogicDel();
-            ResultViewingPageVo sumScore = evaluateResultMapper.selectJoinOne(ResultViewingPageVo.class, evaluateResultMPJLambdaWrapper);*/
         }
+        List<ResultViewingListVo> resultViewingList = evaluateResultMapper.getResultViewingList(dto.getEvaluateManageId());
         //遍历分页记录
-        for (ResultViewingPageVo resultViewingPageVo : resultViewingPageVoIPage.getRecords()) {
+        for (ResultViewingPageVo resultViewingPageVo : list) {
             List<ResultViewingPageVo> resultViewingPageVoList = groupedByObjectIdList.get(resultViewingPageVo.getObjectId());
-            if(resultViewingPageVoList != null && resultViewingPageVoList.size() > 0){
+            Map<Long, List<ResultViewingListVo>> itemMaps = resultViewingList.stream().filter(x -> x.getObjectId().equals(resultViewingPageVo.getObjectId()))
+                    .collect(Collectors.groupingBy(ResultViewingListVo::getEvaluateManageItemId));
+
+            if(resultViewingPageVoList != null && !resultViewingPageVoList.isEmpty()){
                 for (ResultViewingPageVo r : resultViewingPageVoList) {
+                    double v = itemMaps.get(r.getEvaluateManageItemId()).stream().mapToDouble(ResultViewingListVo::getScore).average().orElse(0.0);
                     resultData.add(new ResultViewingPageVo(){{
                         setObjectId(resultViewingPageVo.getObjectId());
                         setObjectIdCN(resultViewingPageVo.getObjectIdCN());
                         setEvaluateManageItemId(r.getEvaluateManageItemId());
                         setProblem(evaluateManageItemMap.get(r.getEvaluateManageItemId()).getProblem());
                         setTopic(evaluateManageItemMap.get(r.getEvaluateManageItemId()).getTopic());
-                        setPlanExecuterNum(planAndActualExecuterNumMap.get(resultViewingPageVo.getObjectId()).getPlanExecuterNum());
-                        int actualExecuterNum = planAndActualExecuterNumMap.get(resultViewingPageVo.getObjectId()).getActualExecuterNum();
+                        setPlanExecuterNum(planAndShouldExecuterNumMap.get(resultViewingPageVo.getObjectId()).size());
+                        int actualExecuterNum = planAndActualExecuterNumMap.get(resultViewingPageVo.getObjectId()).size();
                         setActualExecuterNum(actualExecuterNum);
-                        setSumScore(r.getSumScore()/actualExecuterNum);
+                        setSumScore(BigDecimal.valueOf(v).setScale(2, RoundingMode.HALF_UP).doubleValue() + "");
                     }});
                 }
             }
         }
-        resultViewingPageVoIPage.setRecords(resultData);
-
-        /*for (ResultViewingPageVo resultViewingPageVo : resultViewingPageVoIPage.getRecords()) {
-            //获取该评价管理下的单个被评对象的应打分人数，实际打分人数
-            MPJLambdaWrapper<EvaluateExecuter> evaluateExecuterMPJLambdaWrapper = new MPJLambdaWrapper<>();
-            evaluateExecuterMPJLambdaWrapper
-                    .select("count(t.id) as planExecuterNum")
-                    .selectSum(EvaluateExecuter::getStatus, ResultViewingPageVo::getActualExecuterNum)
-                    .leftJoin(EvaluateObject.class, EvaluateObject::getId, EvaluateExecuter::getEvaluateObjectId)
-                    .eq(EvaluateExecuter::getEvaluateManageId, dto.getEvaluateManageId())
-                    .eq(EvaluateObject::getObjectId, resultViewingPageVo.getObjectId())
-                    .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 (ResultViewingPageVo resultViewingPageVo : resultViewingPageVoIPage.getRecords()) {
-            //添加应打分人数，实际打分人数，综合评分
-            MPJLambdaWrapper<EvaluateExecuter> evaluateExecuterPlanExecuterNum = new MPJLambdaWrapper<>();
-            evaluateExecuterPlanExecuterNum
-                    .selectSum(EvaluateExecuter::getStatus, ResultViewingPageVo::getActualExecuterNum)
-                    .selectSum(EvaluateResult::getScore, ResultViewingPageVo::getActualExecuterNum)
-                    .leftJoin(EvaluateResult.class, EvaluateResult::getEvaluatedObjectId, EvaluateExecuter::getEvaluateObjectId)
-                    .eq(EvaluateExecuter::getEvaluateManageId, dto.getEvaluateManageId())
-                    .eq(EvaluateExecuter::getEvaluateObjectId, resultViewingPageVo.getEvaluateObjectId());
-
-            List<ResultViewingPageVo> resultViewingPageVoList = evaluateExecuterMapper.selectJoinList(ResultViewingPageVo.class, evaluateExecuterPlanExecuterNum);
-            resultViewingPageVo.setPlanExecuterNum(resultViewingPageVoList.size());
-
-            //查出所有的题目项目
-            MPJLambdaWrapper<EvaluateManageItem> evaluateManageItemMPJLambdaWrapper = new MPJLambdaWrapper<>();
-            evaluateManageItemMPJLambdaWrapper
-                    .selectSum(EvaluateResult::getScore, AllEvaluateManageItemVo::getAllActualScore)
-                    .selectAs(EvaluateManageItem::getProblem, AllEvaluateManageItemVo::getProblem)
-                    .selectAs(EvaluateManageItem::getTopic, AllEvaluateManageItemVo::getTopic)
-                    .leftJoin(EvaluateResult.class, EvaluateResult::getEvaluateItemId, EvaluateManageItem::getId)
-                    .eq(EvaluateManageItem::getEvaluateManageId, dto.getEvaluateManageId())
-                    .eq(EvaluateResult::getEvaluatedObjectId, resultViewingPageVo.getEvaluateObjectId())
-                    .groupBy(EvaluateManageItem::getProblem, EvaluateManageItem::getTopic);
-
-            List<AllEvaluateManageItemVo> allEvaluateManageItemVoList = evaluateManageItemMapper.selectJoinList(AllEvaluateManageItemVo.class, evaluateManageItemMPJLambdaWrapper);
-
-            Map<String, List<AllEvaluateManageItemVo>> groupedAllEvaluateManageItemVo = allEvaluateManageItemVoList.stream()
-                    .collect(Collectors.groupingBy(AllEvaluateManageItemVo::getTopic));
-
-            List<AllEvaluateManageItemByTopicVo> allEvaluateManageItemByTopicVoList = new ArrayList<>();
-            groupedAllEvaluateManageItemVo.forEach((topic, group) -> {
-                allEvaluateManageItemByTopicVoList.add(new AllEvaluateManageItemByTopicVo(){{
-                    setTopic(topic);
-                    setAllEvaluateManageItemVoList(group);
-                    int allTopicScore = 0;
-                    for (AllEvaluateManageItemVo allEvaluateManageItemVo : group) {
-                        allTopicScore += allEvaluateManageItemVo.getAllActualScore();
-                    }
-                    setAllTopicScore(allTopicScore);
-                }});
-            });
-            resultViewingPageVo.setAllEvaluateManageItemByTopicVoList(allEvaluateManageItemByTopicVoList);
-        }*/
-        return resultViewingPageVoIPage;
+
+        return resultData;
     }
 
     @Override
@@ -428,9 +334,9 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
             //获取该评价管理下的所有被评对象的总得分
             List<ResultViewingPageVo> listSynthesisScore = evaluateResultMapper.listSynthesisScore(evaluateObjectIdList, evaluateManageItemIdList);
             //将所有被评对象的总得分处理成Map
-            for (ResultViewingPageVo r : listSynthesisScore) {
-                synthesisScoreMap.put(r.getObjectId(), r.getSynthesisScore());
-            }
+//            for (ResultViewingPageVo r : listSynthesisScore) {
+//                synthesisScoreMap.put(r.getObjectId(), r.getSynthesisScore());
+//            }
 
             /*MPJLambdaWrapper<EvaluateResult> evaluateResultMPJLambdaWrapper = new MPJLambdaWrapper<>();
             evaluateResultMPJLambdaWrapper
@@ -458,7 +364,7 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
                         setPlanExecuterNum(planAndActualExecuterNumMap.get(resultViewingPageVo.getObjectId()).getPlanExecuterNum());
                         int actualExecuterNum = planAndActualExecuterNumMap.get(resultViewingPageVo.getObjectId()).getActualExecuterNum();
                         setActualExecuterNum(actualExecuterNum);
-                        setSumScore(r.getSumScore()/actualExecuterNum);
+//                        setSumScore((r.getSumScore()/actualExecuterNum) + "");
                         setSynthesisScore(synthesisScoreMap.get(resultViewingPageVo.getObjectId())/actualExecuterNum);
                     }});
                 }

src/main/java/com/xjrsoft/module/evaluate/vo/ResultViewingListVo.java

@@ -0,0 +1,42 @@
+package com.xjrsoft.module.evaluate.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 评价项表单出参
+* @Author dzx
+* @Date: 2024年11月6日
+* @Version 1.0
+*/
+@Data
+public class ResultViewingListVo {
+
+    /**
+    * 具体被评的那个对象的id
+    */
+    @ApiModelProperty("答题结果id")
+    private Long id;
+    /**
+     * 具体被评的那个对象的id
+     */
+    @ApiModelProperty("具体被评的那个对象的id")
+    private Long objectId;
+
+    /**
+     * 题目项的id
+     */
+    @ApiModelProperty("题目项的id")
+    private Long evaluateManageItemId;
+    /**
+     * 题目名称
+     */
+    @ApiModelProperty("答题人")
+    private Long userId;
+    /**
+     * 单个被评对象的每一道题的平均得分
+     */
+    @ApiModelProperty("分数")
+    private Integer score;
+
+}

src/main/java/com/xjrsoft/module/evaluate/vo/ResultViewingPageVo.java

@@ -46,7 +46,7 @@ public class ResultViewingPageVo {
      * 单个被评对象的每一道题的平均得分
      */
     @ApiModelProperty("单个被评对象的每一道题的平均得分")
-    private Integer sumScore;
+    private String sumScore;
     /**
      * 标题名称
      */
@@ -56,11 +56,14 @@ public class ResultViewingPageVo {
      * 单个被评对象的每一道题的平均得分
      */
     @ApiModelProperty("单个被评对象的每个标题的平均得分")
-    private Integer topicScore;
+    private String topicScore;
     /**
      * 单个被评对象的每一道题的平均得分
      */
     @ApiModelProperty("单个被评对象的综合平均得分")
-    private Integer synthesisScore;
+    private String synthesisScore;
+
+    @ApiModelProperty("状态（2：已评分，0：未评分）")
+    private Integer status;
 
 }

src/main/java/com/xjrsoft/module/personnel/controller/BasePersonnelLabourCapitalController.java

@@ -114,7 +114,7 @@ public class BasePersonnelLabourCapitalController {
     public RT<Boolean> add(@Valid @RequestBody AddBasePersonnelLabourCapitalDto dto){
         BasePersonnelLabourCapital basePersonnelLabourCapital = BeanUtil.toBean(dto, BasePersonnelLabourCapital.class);
         boolean isSuccess = basePersonnelLabourCapitalService.add(basePersonnelLabourCapital);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping
@@ -132,7 +132,6 @@ public class BasePersonnelLabourCapitalController {
     @SaCheckPermission("basepersonnellabourcapital:delete")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
         return RT.ok(basePersonnelLabourCapitalService.delete(ids));
-
     }
     @PostMapping("/import")
     @ApiOperation(value = "导入")

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

@@ -201,4 +201,11 @@
         AND t3.month = #{dto.month}
         AND t4.evaluate_type = #{dto.evaluateType}
     </select>
+
+    <select id="getResultViewingList" resultType="com.xjrsoft.module.evaluate.vo.ResultViewingListVo">
+        SELECT t1.id,t2.object_id,t3.id as evaluate_manage_item_id,t1.score,t1.user_id FROM evaluate_result t1
+        INNER JOIN evaluate_object t2 ON t1.evaluated_object_id = t2.id
+        INNER JOIN evaluate_manage_item t3 ON t3.id = t1.evaluate_item_id
+        WHERE t3.evaluate_manage_id = #{evaluateManageId}
+    </select>
 </mapper>