From 2d11c424e0de372f0b150f9dbff68708dde50959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Thu, 20 Feb 2020 14:15:41 +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=E4=BF=AE=E6=94=B9=20=E7=BB=9F=E8=AE=A1=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/evaluate/EvaluateOptionDTO.java  |  5 ++
 .../dto/evaluate/EvaluateSelectOption.java    |  4 ++
 .../controller/EvaluateOptionController.java  |  1 +
 .../evaluate/entity/EvaluateOptionEntity.java |  4 ++
 .../impl/EvaluateOptionServiceImpl.java       | 18 +++++-
 .../mapper/evaluate/EvaluateInfoDao.xml       |  7 ++-
 .../mapper/evaluate/EvaluateOptionDao.xml     | 58 ++++++++++++++-----
 7 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptionDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptionDTO.java
index fb3275437..627098785 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptionDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptionDTO.java
@@ -89,4 +89,9 @@ public class EvaluateOptionDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 一致性ID
+     */
+    private String pid;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateSelectOption.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateSelectOption.java
index ece866621..63c91d36a 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateSelectOption.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateSelectOption.java
@@ -21,6 +21,10 @@ public class EvaluateSelectOption {
      * 选中状态
      */
     private String selectFlag;
+    /**
+     * 选中选项
+     */
+    private String roleCode;
 
 }
 
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java
index 2a03a0e4c..7d6a636cd 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java
@@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 
 /**
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOptionEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOptionEntity.java
index 72b00037c..0f9380b62 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOptionEntity.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOptionEntity.java
@@ -54,5 +54,9 @@ public class EvaluateOptionEntity extends BaseEpdcEntity {
      * 可用标记(0-不可用，1-可用)
      */
 	private String available;
+	/**
+	 * 一致性ID
+	 */
+	private String pid;
 
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOptionServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOptionServiceImpl.java
index 7e4eef995..949217e2f 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOptionServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOptionServiceImpl.java
@@ -40,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * 评价选项表 评价选项表
@@ -109,8 +110,21 @@ public class EvaluateOptionServiceImpl extends BaseServiceImpl<EvaluateOptionDao
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(EvaluateOptionDTO dto) {
-        EvaluateOptionEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateOptionEntity.class);
-        insert(entity);
+
+        if(dto.getRoleCode() == 0){
+            String id = UUID.randomUUID().toString().replaceAll("-", "");
+            dto.setPid(id);
+            dto.setRoleCode(1);
+            EvaluateOptionEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateOptionEntity.class);
+            insert(entity);
+            dto.setRoleCode(2);
+            entity = ConvertUtils.sourceToTarget(dto, EvaluateOptionEntity.class);
+            insert(entity);
+        } else {
+            EvaluateOptionEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateOptionEntity.class);
+            insert(entity);
+        }
+
     }
 
     @Override
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 f8554a6cb..6c82a65cb 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
@@ -70,15 +70,20 @@
 
     <resultMap type="com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption" id="optionResultMap">
         <result property="optionId" column="OPTION_ID"/>
+        <result property="roleCode" column="ROLE_CODE"/>
         <result property="selectFlag" column="SELECT_FLAG"/>
     </resultMap>
 
     <select id="getInfoDetail" resultMap="optionResultMap">
         SELECT
-        detail.OPTION_ID,
+        IF
+        ( OPTIONS.PID IS NOT NULL, OPTIONS.PID, detail.OPTION_ID ) OPTION_ID,
+        detail.ROLE_CODE,
         detail.SELECT_FLAG
         FROM
         epdc_evaluate_detail detail
+        LEFT JOIN epdc_evaluate_option OPTIONS ON detail.OPTION_ID = OPTIONS.ID
+        AND OPTIONS.DEL_FLAG = '0'
         WHERE
         detail.DEL_FLAG = '0'
         <if test="id != null and id != ''">
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml
index cee66469e..bbf9f6b2c 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml
@@ -6,6 +6,7 @@
     <resultMap type="com.elink.esua.epdc.modules.evaluate.entity.EvaluateOptionEntity" id="evaluateOptionMap">
         <result property="id" column="ID"/>
         <result property="roleCode" column="ROLE_CODE"/>
+        <result property="pid" column="PID"/>
         <result property="optionContent" column="OPTION_CONTENT"/>
         <result property="sort" column="SORT"/>
         <result property="available" column="AVAILABLE"/>
@@ -38,7 +39,7 @@
         <if test="optionContent != null and optionContent != ''">
             and OPTION_CONTENT like '%' #{optionContent} '%'
         </if>
-        <if test="roleCode != null and roleCode != ''">
+        <if test='roleCode != null and roleCode != "" and roleCode != "0"'>
             and ROLE_CODE = #{roleCode}
         </if>
         order by sort, UPDATED_TIME desc
@@ -61,28 +62,52 @@
         <if test="roleCode != null and roleCode != ''">
             and ROLE_CODE = #{roleCode}
         </if>
+
         order by sort, CREATED_TIME desc
     </select>
 
-    <resultMap type="com.elink.esua.epdc.dto.evaluate.EvaluateShowOption" id="evaluateShowOptionMap">
-        <result property="index" column="Num"/>
-        <result property="optionContent" column="OPTION_CONTENT"/>
-    </resultMap>
     <select id="optionShowList" resultMap="evaluateOptionAppResultMap">
-        SELECT
-        ID,
-        ROLE_CODE,
-        OPTION_CONTENT
-        FROM
-        epdc_evaluate_option
-        WHERE
-        DEL_FLAG = '0'
-        ORDER BY
-        ROLE_CODE,
-        SORT ASC
+       SELECT
+	       tab.ID,
+	       tab.ROLE_CODE,
+	       tab.OPTION_CONTENT
+       FROM
+	       (
+       SELECT
+	       Pid AS ID,
+	       0 AS ROLE_CODE,
+	       OPTION_CONTENT,
+	       SORT
+       FROM
+	       epdc_evaluate_option
+       WHERE
+	       DEL_FLAG = '0'
+	       AND PID IS NOT NULL
+       GROUP BY
+	       PID UNION
+       SELECT
+	       ID,
+	       ROLE_CODE,
+	       OPTION_CONTENT,
+	       SORT
+       FROM
+	       epdc_evaluate_option
+       WHERE
+	       DEL_FLAG = '0'
+	       AND PID IS NULL
+	       ) tab
+       ORDER BY
+	       tab.ROLE_CODE,
+	       tab.SORT ASC
     </select>
 
     <select id="listSimpleDictInfo" resultType="com.elink.esua.epdc.dto.evaluate.result.RoleDictDTO">
+        SELECT
+        0  as dictValue,
+        '全部' as dictName
+        FROM
+        dual
+        UNION
         SELECT
         ROLE_CODE dictValue,
         RULE_DESC dictName
@@ -90,6 +115,7 @@
         epdc_evaluate_role
         WHERE
         DEL_FLAG = '0'
+
     </select>