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 getBussStandTypeData(){ + private Map getBussStandTypeData(){ Map resultMap = new HashMap<>(); List> bussStandTypeList = new ArrayList<>(); - char letter = 'A'; - for(letter = 'A'; letter <= 'Z'; ++letter){ + List dicTypeNameList = new ArrayList<>(); + String dicId = "NGETEMDJDI"; + dicTypeNameList = dicTypeEOService.selectByDicId(dicId); + for (String dicTypeName : dicTypeNameList){ Map 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 { List selectPidByCode(@Param("fileType") String fileType); List selectDic(String id); + + List 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 { public List> getDicTypeByParentCodes(String dicTypeCode); + List 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 im return listMap; } + @Override + public List 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} + +