From 41deabd1528f252f67ae868845908809954b958b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sat, 2 Apr 2022 16:34:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=97=A8=E7=94=A8=E6=9D=A5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AD=98=E5=9C=A8=E5=88=86=E8=A7=A3=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 8 ++++++++ .../da/slrs/sarStandItems/dao/SarStandItemsDao.java | 2 ++ .../service/impl/SarStandItemsServiceImpl.java | 13 +++++++++++++ .../mapper/SarStandItems/SarStandItemsMapper.xml | 5 +++++ 4 files changed, 28 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index f28a5e80..a870eb5f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -137,5 +137,13 @@ public class SarStandItemsController extends BaseController { return Result.success(fileType); } + @ApiOperation(value = "|SarFileSplitInfoEO|根据标准id查询分解单的文本类型用在合规评估的") + @GetMapping("getFileTypeHG") + public ResponseMessage>> getFileTypeHG(String standId){ + List> fileType = ServiceImpl.getFileTypeHG(standId); + + return Result.success(fileType); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 19cc2890..4f66254b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -80,4 +80,6 @@ public interface SarStandItemsDao extends BaseMapper { * @return */ List getFileType(@Param("standId") String standId); + + List getFileTypeHG(@Param("standId") String standId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index b6b8aa56..f16e9c4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -294,6 +294,19 @@ public class SarStandItemsServiceImpl extends ServiceImpl> getFileTypeHG(String standId){ + List fileType = dao.getFileTypeHG(standId); + Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() + .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); + + List> collect = fileType.stream() + .map(item -> new HashMap(){ { put("label", typeNameMap.get(item));put("value", item);} } + ).collect(Collectors.toList()); + + return collect; } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 09d36ed4..dd4fbf5c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -806,4 +806,9 @@ SELECT FILE_type from sar_file_split_info WHERE STAND_ID = #{standId} AND VALID_FLAG = '0' GROUP BY FILE_TYPE + +