From f9f4c0c0b4b79ebc3c1f65e3cb3482e58239c275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E6=96=B0=E4=BC=9F?= <1152856986@qq.com>
Date: Tue, 15 Mar 2022 13:31:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/EarlyWarningEODao.java                |  2 ++
 .../Impl/EarlyWarningEOServiceImpl.java       |  9 +++++++++
 .../sarStandWarning/EarlyWraningEOMapper.xml  | 19 +++++++++++++------
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java
index 618770a0..3b327344 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java
@@ -17,4 +17,6 @@ public interface EarlyWarningEODao extends BaseMapper<EarlyWarningEO> {
 
     List<WarningExportVO> exportWarning(@Param("idList") List<String> ids);
 
+    String exportShow(@Param("str") List<String> str);
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
index 0b8f6f78..6fc179f0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.List;
 
 @Service("EarlyWarningEOService")
@@ -123,6 +124,14 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
     @Override
     public List<WarningExportVO> getExportExcel(WarningExcelVO excelVO){
         List<WarningExportVO> standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds());
+        for(WarningExportVO vo:standWarningEOList){
+            if (vo.getApplyType() == null || vo.getApplyType().equals("")){
+                vo.setApplyTypeShow(null);
+            }else {
+                List<String> str = Arrays.asList(vo.getApplyType().split(","));
+                vo.setApplyTypeShow(earlyWarningEODao.exportShow(str));
+            }
+        }
 //        IPage<StandWarningEO> standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, null);
 
         return  standWarningEOList;
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
index bbdbf4e5..8913444b 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
@@ -99,7 +99,6 @@
 
         SELECT
         <include refid="export_column"/> ,
-        dicType.DIC_TYPE_NAME AS applyTypeShow,
         attr.CLLX AS APPLY_TYPE ,
         attr.ZRGCS AS DUTY_ENGINEER ,
         NULL AS ITEM_ID ,
@@ -115,7 +114,6 @@
         FROM sar_stand_warning AS warning
         LEFT JOIN sar_standards_info AS sarInfo on sarInfo.id=warning.STAND_ID
         LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID
-        LEFT JOIN ts_dictype as dicType on (attr.CLLX = dicType.DIC_TYPE_CODE   AND attr.CLLX !=null AND attr.CLLX != '')
         <where>
             POWER = '1'
             AND (MARK = 'stand')
@@ -137,7 +135,6 @@
 
         SELECT
         <include refid="export_column"/> ,
-        dicType.DIC_TYPE_NAME AS applyTypeShow,
         items.APPLY_ARCTIC AS APPLY_TYPE ,
         items.DUTY_ENGINEER AS DUTY_ENGINEER ,
         items.ID AS ITEM_ID ,
@@ -155,7 +152,6 @@
         LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID
         LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEM_ID
         LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID
-        LEFT JOIN ts_dictype as dicType on (dicType.DIC_TYPE_CODE = items.APPLY_ARCTIC  AND items.APPLY_ARCTIC !=null AND items.APPLY_ARCTIC != '')
         <where>
             POWER = '1'
             AND (MARK = 'item')
@@ -293,6 +289,17 @@
         ORDER BY warning_date.SSRQ_MIN
 
     </select>
-
-
+    <select id="exportShow" resultType="java.lang.String">
+        SELECT
+	    group_concat( td.DIC_TYPE_NAME SEPARATOR ',' ) as applyTypeShow
+        FROM
+	    ts_dictype td
+        WHERE
+	    td.DIC_TYPE_CODE
+	    IN
+        <foreach collection="str" item="dicTypeCode" open="(" close=")" separator=",">
+            <!-- 每个遍历需要生成的串 -->
+            #{dicTypeCode}
+        </foreach>
+    </select>
 </mapper>