修改 只要活动上线即可显示

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileVProjectListVo.java

@@ -58,16 +58,17 @@ public class SmileVProjectListVo implements Serializable, Cloneable {
         this.setAddress(source.getAddress());
         this.setImg(source.getImg());
         this.setApplyStatus(applyStatus);
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime ldtStart = LocalDateTime.parse(source.getTimeStart(), DTF_YMD_HMS);
-        LocalDateTime ldtEnd = LocalDateTime.parse(source.getTimeEnd(), DTF_YMD_HMS);
-        if (now.isAfter(ldtEnd)) {
-            this.setProjectStatus(2);
-        } else if (now.isBefore(ldtStart)) {
-            this.setProjectStatus(0);
-        }else{
+//        LocalDateTime now = LocalDateTime.now();
+//        LocalDateTime ldtStart = LocalDateTime.parse(source.getTimeStart(), DTF_YMD_HMS);
+//        LocalDateTime ldtEnd = LocalDateTime.parse(source.getTimeEnd(), DTF_YMD_HMS);
         this.setProjectStatus(1);
-        }
+//        if (now.isAfter(ldtEnd)) {
+//            this.setProjectStatus(2);
+//        } else if (now.isBefore(ldtStart)) {
+//            this.setProjectStatus(0);
+//        }else{
+//            this.setProjectStatus(1);
+//        }
         return this;
     }
 

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

@@ -50,28 +50,29 @@ public class SmileVolunteerServerImpl implements SmileVolunteersService {
 //            }
         }
         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());
+//        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());
+        voList = voList.stream().sorted(Comparator.comparing(SmileVProjectListVo::getTimeStart)).collect(Collectors.toList());
         return ResponseDto.success(voList);
     }