From b1ecd09547f9cf3dd065a035685f25f97bc5de6f Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 26 Jan 2022 20:37:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarStandItemsController.java   |  8 ++++
 .../sarStandItems/dao/SarStandItemsDao.java   |  2 +
 .../impl/SarStandItemsServiceImpl.java        | 37 +++++++++++++++++++
 .../SarStandItems/SarStandItemsMapper.xml     | 14 +++++++
 4 files changed, 61 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 f43caaab..f28a5e80 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
@@ -53,6 +53,14 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
         }
     }
 
+    @ApiOperation(value = "分解单查询")
+    @GetMapping("/findItemById")
+    public ResponseMessage findItemById( @RequestParam("type") String type,@RequestParam("ids") String ids){
+        String[] Sids=ids.split(",");
+        List<SarStandItemsDto> ItemDto = ServiceImpl.findItemById(type,Sids);
+        return Result.success("200",ItemDto);
+    }
+
     @ApiOperation(value = "项目评估流程分解单查询")
     @GetMapping("/workflowFindItems")
     public ResponseMessage workflowFindItems( @RequestParam("ids") String ids,@RequestParam("types") String types){
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 1e19f4bf..19cc2890 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
@@ -63,6 +63,8 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
 
     List<SarStandItemsDto> selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids);
 
+    List<SarStandItemsDto> findItemById(@Param("type") String type,@Param("ids") String[] ids);
+
     StandsTimeDto selectStandTime(String standId);
 
     List<StandsTimeDto> selectStandTimeAll();
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 bdda5828..5a4693fe 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
@@ -220,6 +220,43 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         }
     }
 
+    public List<SarStandItemsDto> findItemById(String type,String[] ids){
+        List<SarStandItemsDto> list=dao.findItemById(type,ids);
+        List<SarStandItemsDto> res=new ArrayList<>();
+        List<SarStandItemsDto> chinese=new ArrayList<>();
+        if (null == list || list.isEmpty()){
+            return list;
+        }else {
+            List<Integer> integerList=new ArrayList<>();
+            Map<Integer,List<SarStandItemsDto>> map=new HashMap<>();
+            list.forEach(sarStandItemsDto -> {
+                int a= sarStandItemsDto.getItemsNum().indexOf(".");
+                String mark=sarStandItemsDto.getItemsNum();
+                if (a>0){
+                    mark=mark.substring(0,a);
+                }
+                try {
+                    if (null != map.get(Integer.valueOf(mark))) {
+                        map.get(Integer.valueOf(mark)).add(sarStandItemsDto);
+                    } else {
+                        integerList.add(Integer.valueOf(mark));
+                        List<SarStandItemsDto> middle = new ArrayList<>();
+                        middle.add(sarStandItemsDto);
+                        map.put(Integer.valueOf(mark), middle);
+                    }
+                }catch (Exception e){
+                    chinese.add(sarStandItemsDto);
+                }
+            });
+            Collections.sort(integerList);
+            integerList.forEach(integer -> {
+                res.addAll(map.get(integer));
+            });
+            res.addAll(chinese);
+            return res;
+        }
+    }
+
 
     public List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
         //排序
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 9a3ddd67..09d36ed4 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
@@ -757,6 +757,20 @@
         </if>
         order by ITEMS_NUM
     </select>
+
+    <select id="findItemById" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
+        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq ,read_content as technicalRequir ,compared_with_previous as changePoint
+        ,TERMS_CONDITIONS as termsConditions
+        from SAR_STAND_ITEMS
+        where FILE_TYPE=#{type}
+        <if test="ids != null">
+            and ID in
+            <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        order by ITEMS_NUM
+    </select>
     <select id="selectStandTime" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">
         select STAND_ID,XCXSSRQ,ZCCSSRQ
         from sar_stand_attr_info