项目评估流程排序问题

2021-09-16 15:00:14 +08:00
parent d5081e56f7
commit 6e88f37c28
3 changed files with 32 additions and 5 deletions
@@ -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);
@@ -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;
+        }
    }


@@ -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