赢家平台-团队成员活动量得分倒序排序【1:天;2:周;3:月(不传默认2:周)】

yd-api/src/main/java/com/yd/api/practitioner/service/impl/ScheduleTrackServiceImpl.java

@@ -294,7 +294,7 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
             List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(practitionerId,null);
             List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(practitionerId,null);
             if(null == findByObjSortable ){
             if(null == findByObjSortable ){
                 resp.setCommonResult(new CommonResult(false,ZHBErrorConfig.getErrorInfo("630028")));
                 resp.setCommonResult(new CommonResult(false,ZHBErrorConfig.getErrorInfo("630028")));
-                return resp;
+//                return resp;
             }
             }
             // 获取本月第一天
             // 获取本月第一天
             Calendar cal = Calendar.getInstance();
             Calendar cal = Calendar.getInstance();
@@ -354,21 +354,21 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
                 public int compare(PersonalPEPScore o1, PersonalPEPScore o2) {
                 public int compare(PersonalPEPScore o1, PersonalPEPScore o2) {
                 	if("1".equals(requestVO.getSortType())){
                 	if("1".equals(requestVO.getSortType())){
                         if (o1 != null && o2 != null) {
                         if (o1 != null && o2 != null) {
-                            return o1.getDayScore().compareTo(o2.getDayScore());
+                            return o2.getDayScore().compareTo(o1.getDayScore());
                         } else {
                         } else {
-                            return o1 == null ? 1 : -1;
+                            return o2 == null ? 1 : -1;
                         }
                         }
                 	}else if("3".equals(requestVO.getSortType())){
                 	}else if("3".equals(requestVO.getSortType())){
                 		if (o1 != null && o2 != null) {
                 		if (o1 != null && o2 != null) {
-                            return o1.getMonthScore().compareTo(o2.getMonthScore());
+                            return o2.getMonthScore().compareTo(o1.getMonthScore());
                         } else {
                         } else {
-                            return o1 == null ? 1 : -1;
+                            return o2 == null ? 1 : -1;
                         }
                         }
                 	}else{
                 	}else{
                 		if (o1 != null && o2 != null) {
                 		if (o1 != null && o2 != null) {
-                            return o1.getWeekScore().compareTo(o2.getWeekScore());
+                            return o2.getWeekScore().compareTo(o1.getWeekScore());
                         } else {
                         } else {
-                            return o1 == null ? 1 : -1;
+                            return o2 == null ? 1 : -1;
                         }
                         }
                 	}
                 	}
                 }
                 }