From 369567886f35f3a04f8677c115bcfae9c78b5f13 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Sun, 23 Apr 2023 17:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2?=
 =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E7=9A=84=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/slrs/processModel/exportWkExcel.java | 13 ++++++++-----
 .../service/impl/TsDicTypeServiceImpl.java          |  1 +
 .../main/java/com/adc/da/sys/dao/DicTypeEODao.java  |  2 ++
 .../com/adc/da/sys/service/IDicTypeEOService.java   |  1 +
 .../da/sys/service/impl/DicTypeEOServiceImpl.java   |  5 +++++
 .../mybatis/mapper/sys/DicTypeEOMapper.xml          |  4 ++++
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java
index f246215b..baa858ea 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java
@@ -7,6 +7,7 @@ import com.adc.da.slrs.processModel.entity.exportExcel;
 import com.adc.da.slrs.processModel.entity.importExcelDTO;
 import com.adc.da.slrs.processModel.service.impl.IExportServiceImpl;
 import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk;
+import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService;
 import com.adc.da.sys.service.IDicTypeEOService;
 import com.adc.da.util.exception.AdcDaBaseException;
 import com.adc.da.util.http.ResponseMessage;
@@ -72,14 +73,16 @@ public class exportWkExcel {
      * 静态加载企标类别下拉框
      * @return
      */
-    private static Map<String,Object> getBussStandTypeData(){
+    private Map<String,Object> getBussStandTypeData(){
         Map<String,Object> resultMap = new HashMap<>();
         List<Map<String,String>> bussStandTypeList = new ArrayList<>();
-        char letter = 'A';
-        for(letter = 'A'; letter <= 'Z'; ++letter){
+        List<String> dicTypeNameList = new ArrayList<>();
+        String dicId = "NGETEMDJDI";
+        dicTypeNameList = dicTypeEOService.selectByDicId(dicId);
+        for (String dicTypeName : dicTypeNameList){
             Map<String,String> typeMap = new HashMap<>();
-            typeMap.put("label","Q/FT "+letter);
-            typeMap.put("value","Q/FT "+letter);
+            typeMap.put("label",dicTypeName);
+            typeMap.put("value",dicTypeName);
             bussStandTypeList.add(typeMap);
         }
         resultMap.put("BUSSSTANDCLASS",bussStandTypeList);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java
index 7870f248..c55fb826 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsDictionaryType/service/impl/TsDicTypeServiceImpl.java
@@ -5,6 +5,7 @@ import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao;
 import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu;
 import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java
index e45f277a..c2581979 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java
@@ -92,4 +92,6 @@ public interface DicTypeEODao extends BaseMapper<DicTypeEO> {
     List<DicTypeEO> selectPidByCode(@Param("fileType") String fileType);
 
     List<DicTypeEO> selectDic(String id);
+
+    List<String> selectByDicId(@Param("dicId") String dicId);
 }
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java
index 0b1d5fc2..43bd3bd8 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java
@@ -88,4 +88,5 @@ public interface IDicTypeEOService extends IService<DicTypeEO> {
 
     public List<Map<String,String>> getDicTypeByParentCodes(String dicTypeCode);
 
+    List<String> selectByDicId(String dicId);
 }
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java
index cf7a4b89..495403a3 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java
@@ -278,6 +278,11 @@ public class DicTypeEOServiceImpl extends ServiceImpl<DicTypeEODao,DicTypeEO> im
         return listMap;
     }
 
+    @Override
+    public List<String>  selectByDicId(String dicId) {
+        return dicTypeEODao.selectByDicId(dicId);
+    }
+
     /**
      * @Author liwenxuan
      * @Description 用来企业大类判断新增是否重复
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
index 74e4b2af..3778955d 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
@@ -649,4 +649,8 @@
         WHERE
             DIC_ID = #{id}
     </select>
+
+    <select id="selectByDicId" resultType="java.lang.String">
+        select DIC_TYPE_NAME from ts_dictype where dic_id = #{dicId}
+    </select>
 </mapper>