修改缺陷

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

@@ -73,5 +73,5 @@ public interface CoreEvaluateTaskMapper extends BaseMapper<CoreEvaluateTask> {
     Page<CoreEvaluateTaskVO> selectAppPageList(@Param("page") Page<CoreEvaluateTaskVO> page, @Param("request") EvaluateTaskDTO request);
     Page<Map> statistics(@Param("page") Page<Map> page, @Param("request") EvaluateTaskStatisticsDTO request);
 
-    List<Map> getContentByTaskId(@Param("taskId") Long taskId);
+    List<Map> getContentByTaskId(@Param("id") Long id);
 }

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

@@ -64,6 +64,9 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
 
     @Override
     public TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO) {
+        EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO=new EvaluateTaskStatisticsDTO();
+        BeanUtils.copyProperties(evaluateTaskDTO,evaluateTaskStatisticsDTO);
+        statistics(evaluateTaskStatisticsDTO);
         Page<CoreEvaluateTaskVO> page;
         //分页
         if (evaluateTaskDTO.getPageNum() != null && evaluateTaskDTO.getPageSize() != null) {
@@ -117,12 +120,12 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         Page<Map> statistics = baseMapper.statistics(page, evaluateTaskStatisticsDTO);
         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);
+            Object id = rows.get(i).get("id");
+            List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id);
             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());
+                    Double score =Double.valueOf(contentByTaskId.get(l).get("score").toString());
                     rows.get(i).put(contentByTaskId.get(l).get("content"), score);
                     total += score;
                 }

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

@@ -19,6 +19,7 @@
                 LEFT JOIN core_evaluate_plan_content b ON a.id = b.content_id
         WHERE
             b.evaluate_id =#{evaluateId}
+        ORDER BY a.`code`
     </select>
 
 </mapper>

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

@@ -115,27 +115,37 @@
     </select>
     <select id="statistics" resultType="java.util.Map">
         SELECT
-        a.id AS taskId,
+        c.id AS id,
         a.org_name AS '评价机构',
-        a.evaluate_org AS '被评价机构名称'
+        d.score AS '被评价机构名称'
         FROM
-        core_evaluate_task a
+        core_evaluate_task_user_content d LEFT JOIN
+        core_evaluate_task_user c ON d.task_user_id=c.id AND d.code=1 LEFT JOIN
+        core_evaluate_task a ON a.id=c.task_id
         LEFT JOIN core_evaluate_plan b ON a.plan_id = b.id
         WHERE
         a.`status` = 2
-        <if test="orgPath != null  and orgPath != ''">
-            AND a.org_path like concat(#{orgPath}, '%')
+        <if test="request.orgPath != null  and request.orgPath != ''">
+            AND a.org_path like concat(#{request.orgPath}, '%')
         </if>
-        <if test="planId != null">
-            AND b.id = #{planId}
+        <if test="request.planId != null">
+            AND b.id = #{request.planId}
         </if>
 
     </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>-->
+  <select id="getContentByTaskId" resultType="java.util.Map">
+      SELECT
+          b.content,
+          IF
+              ( b.content_type = 1, 0, SUM( b.score ) ) score
+      FROM
+          core_evaluate_task_user_content b
+              LEFT JOIN core_evaluate_task_user a ON a.id = b.task_user_id AND b.`code`!=1
+      WHERE
+          a.id = #{id}
+      GROUP BY
+          b.content
+    </select>
     <select id="selectAppPageList" resultType="com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO">
         SELECT
         a.id,

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysAreaCheckServiceImpl.java

@@ -86,7 +86,7 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
         }
         SysAreaCheck areaCheck = new SysAreaCheck();
         areaCheck.setDelFlag("0");
-        areaCheck.setOrgType(sysOrg.getOrgType());
+        areaCheck.setOrgType(sysOrg.getType().toString());
         return baseMapper.selectSysAreaCheckList(areaCheck);
     }