From 6e88f37c28f9874bc189bfde162adfd431e702c5 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 16 Sep 2021 15:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/SarPublicIdeaServiceImpl.java        |  3 +-
 .../impl/SarStandItemsServiceImpl.java        | 33 +++++++++++++++++--
 .../SarStandItems/SarStandItemsMapper.xml     |  1 +
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
index 9c2466f9..f5c6e163 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
@@ -55,8 +55,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
         } else {
             list.like(StringUtils.isNotEmpty(category), "category", category)
                     .like(StringUtils.isNotEmpty(cname), "cname", cname)
-                    .ge(start != null, "start_time", start)
-                    .le(end != null, "end_time", end)
+                    .ge("end_time", new Date())
                     .orderByAsc("end_time");
         }
         Page<SarPublicIdea> page = new Page<>(p, size);
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 a0fbafa7..cc30e365 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
@@ -19,8 +19,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -193,7 +192,35 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
     }
 
     public List<SarStandItemsDto> findAllItems(String type,String[] ids){
-        return dao.selectAllItemsByIds(type,ids);
+        List<SarStandItemsDto> list=dao.selectAllItemsByIds(type,ids);
+        List<SarStandItemsDto> res=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);
+                }
+               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);
+               }
+            });
+            Collections.sort(integerList);
+            integerList.forEach(integer -> {
+                res.addAll(map.get(integer));
+            });
+
+            return res;
+        }
     }
 
 
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 0482c52c..64aa146f 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
@@ -742,6 +742,7 @@
                 #{item}
             </foreach>
         </if>
+        order by ITEMS_NUM
     </select>
     <select id="selectStandTime" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">
         select STAND_ID,XCXSSRQ,ZCCSSRQ