From 4c65fb97d42e30c1f3135d5ecbcc2f8bd30c2c0c Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 28 Dec 2021 19:41:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A0=87=E5=87=86id=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AD=98=E5=9C=A8=E5=88=86=E8=A7=A3=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandItemsController.java | 10 ++++++++++ .../da/slrs/sarStandItems/dao/SarStandItemsDao.java | 8 ++++++++ .../service/impl/SarStandItemsServiceImpl.java | 13 +++++++++++++ .../mapper/SarStandItems/SarStandItemsMapper.xml | 3 +++ 4 files changed, 34 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 60a9ddc3..053e1756 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 @@ -120,4 +120,14 @@ public class SarStandItemsController extends BaseController { return ServiceImpl.sarStandItemsaveBatch(findStandDto); } + + @ApiOperation(value = "|SarFileSplitInfoEO|根据标准id查询分解单的文本类型") + @GetMapping("getFileType") + public ResponseMessage> getFileType(String standId){ + Map fileType = ServiceImpl.getFileType(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 ad550b86..155b7cc1 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 @@ -68,4 +68,12 @@ public interface SarStandItemsDao extends BaseMapper { List selectStandId(@Param("page")int page, @Param("size")int size); int selectToken(); + + + /** + * 根据标准id查询该标准下有分解单的文本类型 + * @param standId + * @return + */ + List getFileType(@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 304f5632..5f0fadbb 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 @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandItems.service.impl; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; +import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails; import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; @@ -12,6 +13,7 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.adc.da.utils.util.InitStandAttrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -21,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; /** *

@@ -238,4 +241,14 @@ public class SarStandItemsServiceImpl extends ServiceImpl sarStandItems = dao.querySarItemAndInterpretation(page); return sarStandItems; } + + public Map getFileType(String standId){ + List fileType = dao.getFileType(standId); + Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() + .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); + + Map collect = fileType.stream() + .collect(Collectors.toMap(a -> a, b -> typeNameMap.get(b))); + 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 fc9e9e94..e5dd9af8 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 @@ -773,5 +773,8 @@ on a.STAND_ID=b.ID WHERE b.VALID_FLAG = 0 +