From a86a18b3f187904e98e33f010f5e93888f3a7de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Tue, 18 Feb 2020 18:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E8=AF=84=E4=BB=B7=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/evaluate/dao/EvaluateInfoDao.java |  2 ++
 .../service/impl/EvaluateInfoServiceImpl.java |  3 ++
 .../mapper/evaluate/EvaluateInfoDao.xml       | 29 +++++++++++++------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java
index 4069caa89..3b485d25d 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java
@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.evaluate.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO;
 import com.elink.esua.epdc.modules.evaluate.entity.EvaluateInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -41,6 +42,7 @@ public interface EvaluateInfoDao extends BaseDao<EvaluateInfoEntity> {
      * @return
      */
     List<EvaluateInfoResultDTO> getInfoPage(Map<String, Object> params);
+    List<EvaluateSelectOption> getInfoDetail(@Param("id")String id);
 
     void deleteEvaluate(@Param("id")String id);
 
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java
index d3c2864b7..5e9a0215e 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java
@@ -77,6 +77,9 @@ public class EvaluateInfoServiceImpl extends BaseServiceImpl<EvaluateInfoDao, Ev
     public PageData<EvaluateInfoResultDTO> infoPage(Map<String, Object> params) {
         IPage<EvaluateInfoResultDTO> page = getPage(params);
         List<EvaluateInfoResultDTO> list = baseDao.getInfoPage(params);
+        for(EvaluateInfoResultDTO item :list){
+            item.setOptionsList(baseDao.getInfoDetail(item.getId()));
+        }
         return new PageData<>(list, page.getTotal());
     }
 
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
index 41e982f6e..f8554a6cb 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
@@ -32,10 +32,7 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="optionCount" column="OPTION_COUNT"/>
-        <collection property="optionsList" ofType="com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption">
-            <result property="optionId" column="OPTION_ID"/>
-            <result property="selectFlag" column="SELECT_FLAG"/>
-        </collection>
+
     </resultMap>
 
     <select id="getInfoPage" resultMap="evaluateInfoResultMap">
@@ -47,13 +44,9 @@
         info.ROLE_CODE,
         info.CONTENT,
         info.OPTION_COUNT,
-        info.CREATED_TIME,
-        detail.OPTION_ID,
-        detail.SELECT_FLAG
+        info.CREATED_TIME
         FROM
         epdc_evaluate_info info
-        LEFT JOIN epdc_evaluate_detail detail ON info.ID = detail.INFO_ID
-        AND detail.DEL_FLAG = '0'
         WHERE
         info.DEL_FLAG = '0'
         <if test="id != null and id != ''">
@@ -74,6 +67,24 @@
         ORDER BY
         info.CREATED_TIME DESC
     </select>
+
+    <resultMap type="com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption" id="optionResultMap">
+        <result property="optionId" column="OPTION_ID"/>
+        <result property="selectFlag" column="SELECT_FLAG"/>
+    </resultMap>
+
+    <select id="getInfoDetail" resultMap="optionResultMap">
+        SELECT
+        detail.OPTION_ID,
+        detail.SELECT_FLAG
+        FROM
+        epdc_evaluate_detail detail
+        WHERE
+        detail.DEL_FLAG = '0'
+        <if test="id != null and id != ''">
+            and detail.INFO_ID = #{id}
+        </if>
+    </select>
     <update id="deleteEvaluate">
         update epdc_evaluate_info set DEL_FLAG = '1' where ID = #{id};
         update epdc_evaluate_detail set DEL_FLAG = '1' where INFO_ID = #{id};