bug

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -669,7 +669,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
         TMonitoringRetrievalPlan plan = baseMapper.selectById(tMonitoringRetrievalPlan.getId());
         BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan);
-        // plan.setIsDistribute("0");
+        SysRole sysRole = remoteRoleService.getRoleById(tMonitoringRetrievalPlan.getRoleId(), SecurityConstants.INNER);
+        plan.setRoleName(sysRole.getRoleName());
         int i = tMonitoringRetrievalPlanMapper.updateById(plan);
         if (CollectionUtils.isEmpty(coreMonitoringRetrievalTasks)) {
             iCoreMonitoringRetrievalTaskService.deleteTaskByPlanId(tMonitoringRetrievalPlan.getId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateTaskMapper.java

@@ -71,4 +71,6 @@ public interface CoreEvaluateTaskMapper extends BaseMapper<CoreEvaluateTask> {
     Page<CoreEvaluateTaskVO> selectPageList(@Param("page") Page<CoreEvaluateTaskVO> page, @Param("request") EvaluateTaskDTO request);
 
     Page<Map> statistics(@Param("page") Page<Map> page, @Param("request") EvaluateTaskDTO request);
+
+    List<Map>getContentByTaskId(@Param("taskId") Long taskId);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/ICoreEvaluateTaskService.java

@@ -9,6 +9,7 @@ import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 外包评价任务Service接口
@@ -80,5 +81,5 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @param evaluateTaskDTO
      * @return
      */
-    TableDataInfo statistics(EvaluateTaskDTO evaluateTaskDTO);
+    TableDataInfo<Map> statistics(EvaluateTaskDTO evaluateTaskDTO);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -3,6 +3,7 @@ package com.xunmei.core.evaluate.service.impl;
 
 import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -36,10 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -67,6 +65,18 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
 
     @Override
     public TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO) {
+/*        TableDataInfo<Map> statistics = statistics(evaluateTaskDTO);
+        List<Map> rows = statistics.getRows();
+        for (int i = 0; i < rows.size(); i++) {
+            Object taskId = rows.get(i).get("taskId");
+            List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) taskId);
+            if (CollectionUtils.isNotEmpty(contentByTaskId)) {
+                for (int l = 0; l < contentByTaskId.size(); l++) {
+                    rows.get(i).put(contentByTaskId.get(l).get("content"), contentByTaskId.get(l).get("score"));
+                }
+            }
+        }*/
+        statistics(evaluateTaskDTO);
         Page<CoreEvaluateTaskVO> page;
         //分页
         if (evaluateTaskDTO.getPageNum() != null && evaluateTaskDTO.getPageSize() != null) {
@@ -102,9 +112,30 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
     }
 
     @Override
-    public TableDataInfo statistics(EvaluateTaskDTO evaluateTaskDTO) {
-
-        return null;
+    public TableDataInfo<Map> statistics(EvaluateTaskDTO evaluateTaskDTO) {
+        Page<Map> page;
+        //分页
+        if (evaluateTaskDTO.getPageNum() != null && evaluateTaskDTO.getPageSize() != null) {
+            page = new Page<>(evaluateTaskDTO.getPageNum(), evaluateTaskDTO.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+        Page<Map> statistics = baseMapper.statistics(page, evaluateTaskDTO);
+        List<Map> rows = statistics.getRecords();
+        for (int i = 0; i < rows.size(); i++) {
+            Object taskId = rows.get(i).get("taskId");
+            List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) taskId);
+            if (CollectionUtils.isNotEmpty(contentByTaskId)) {
+                int total = 0;
+                for (int l = 0; l < contentByTaskId.size(); l++) {
+                    Integer score = Integer.valueOf(contentByTaskId.get(l).get("score").toString());
+                    rows.get(i).put(contentByTaskId.get(l).get("content"), score);
+                    total += score;
+                }
+                rows.get(i).put("合计", total);
+            }
+        }
+        return TableDataInfo.build(statistics);
     }
 
     /**
@@ -141,7 +172,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         CoreEvaluateTaskVO coreEvaluateTaskVO = new CoreEvaluateTaskVO();
         CoreEvaluateTask coreEvaluateTask = coreEvaluateTaskMapper.selectById(id);
         BeanUtils.copyProperties(coreEvaluateTask, coreEvaluateTaskVO);
-        switch ( coreEvaluateTaskVO.getEvaluateCycle()){
+        switch (coreEvaluateTaskVO.getEvaluateCycle()) {
             case "0":
                 coreEvaluateTaskVO.setEvaluateCycle("每月");
                 break;

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -101,8 +101,22 @@ SELECT
         GROUP BY a.id
     </select>
     <select id="statistics" resultType="java.util.Map">
-
+        SELECT
+            a.id AS taskId,
+            a.org_name AS '评价机构',
+                a.evaluate_org AS '被评价机构名称'
+        FROM
+            core_evaluate_task a
+                LEFT JOIN core_evaluate_plan b ON a.plan_id = b.id
+        WHERE
+            a.`status` = 2
+--           AND a.id = '1716653246680956930'
+          AND b.id = '1716653207053172738'
     </select>
+    <select id="getContentByTaskId" resultType="java.util.Map">
+            SELECT   content,IF(content_type=1,0,score)score FROM core_evaluate_task_content    WHERE task_id=#{taskId}
+    </select>
+
 
     <insert id="insertCoreEvaluateTask" parameterType="com.xunmei.core.evaluate.domain.CoreEvaluateTask">
         insert into core_evaluate_task