Prechádzať zdrojové kódy

解决审核界面报错问题,修复大赛没有按时间排序问题

guo00guo 5 rokov pred
rodič
commit
263251d0d0

+ 4 - 1
core/src/main/java/com/mooctest/crowd/domain/repository/CommonRepo.java

@@ -22,6 +22,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -84,7 +85,9 @@ public class CommonRepo {
     public List<Competition> getAllCompetition() {
         return competitionDao.findAll().stream()
                 .map(competitionPO -> Converter.convert(Competition.class, competitionPO))
-                .filter(competition -> competition.getIsDeleted() == DeletedStatus.isNotDeleted).collect(Collectors.toList());
+                .filter(competition -> competition.getIsDeleted() == DeletedStatus.isNotDeleted)
+                .sorted(Comparator.comparing(Competition::getStartTime).reversed())
+                .collect(Collectors.toList());
     }
 
     public Page<Competition> findAllCompetition(Pageable pageable, String keyword) {

+ 11 - 7
site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -1049,7 +1049,9 @@ public class WebMediatorImpl implements ViewMediator {
             BeanUtils.copyProperties(evaluationAgencyPO, agency);
             return new BaseAuthVO(agency);
         }).collect(Collectors.toList()));
-        authingList.sort(Comparator.comparing(BaseAuthVO::getApplytime).reversed());
+        if(authingList.size() > 0 && authingList != null) {
+            authingList.sort(Comparator.comparing(BaseAuthVO::getApplytime).reversed());
+        }
         return authingList;
     }
 
@@ -1062,18 +1064,20 @@ public class WebMediatorImpl implements ViewMediator {
             return new BaseAuthVO(personalAuthentication);
         }).collect(Collectors.toList()));
 
-        authingList.addAll(enterpriseAuthenticationDao.findByIsAuthenticationIsNot(AuthenticationStatus.isAuthenIng).stream().map(enterpriseAuthenticationPO -> {
-            EnterpriseAuthentication enterpriseAuthentication = new EnterpriseAuthentication();
-            BeanUtils.copyProperties(enterpriseAuthenticationPO, enterpriseAuthentication);
-            return new BaseAuthVO(enterpriseAuthentication);
-        }).collect(Collectors.toList()));
+//        authingList.addAll(enterpriseAuthenticationDao.findByIsAuthenticationIsNot(AuthenticationStatus.isAuthenIng).stream().map(enterpriseAuthenticationPO -> {
+//            EnterpriseAuthentication enterpriseAuthentication = new EnterpriseAuthentication();
+//            BeanUtils.copyProperties(enterpriseAuthenticationPO, enterpriseAuthentication);
+//            return new BaseAuthVO(enterpriseAuthentication);
+//        }).collect(Collectors.toList()));
 
         authingList.addAll(agencyDao.findByIsAuthenticationIsNot(AuthenticationStatus.isAuthenIng).stream().map(evaluationAgencyPO -> {
             EvaluationAgency agency = new EvaluationAgency();
             BeanUtils.copyProperties(evaluationAgencyPO, agency);
             return new BaseAuthVO(agency);
         }).collect(Collectors.toList()));
-        authingList.sort(Comparator.comparing(BaseAuthVO::getApplytime).reversed());
+        if(authingList.size() > 0 && authingList != null){
+            authingList.sort(Comparator.comparing(BaseAuthVO::getApplytime).reversed());
+        }
         return authingList;
 
     }