修改 smile排序

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileVolunteerServerImpl.java

@@ -49,7 +49,29 @@ public class SmileVolunteerServerImpl implements SmileVolunteersService {
             voList.add(vo);
 //            }
         }
-        voList = voList.stream().sorted(Comparator.comparing(SmileVProjectListVo::getTimeStart)).collect(Collectors.toList());
+        List<Integer> sortList =  Arrays.asList(1,0,2);
+        voList = voList.stream().sorted(Comparator.comparing(SmileVProjectListVo::getProjectStatus,(x,y)-> {
+            if(x == null && y != null){
+                return 1;
+            }else if(x !=null && y == null){
+                return -1;
+            }else if(x == null && y == null){
+                return -1;
+            } else {
+                for(Integer sort : sortList){
+                    if(sort.equals(x) || sort.equals(y)){
+                        if(x.equals(y)){
+                            return 0;
+                        }else if(sort.equals(x)){
+                            return -1;
+                        }else{
+                            return 1;
+                        }
+                    }
+                }
+                return 0;
+            }
+        }).thenComparing(SmileVProjectListVo::getTimeStart)).collect(Collectors.toList());
         return ResponseDto.success(voList);
     }