Commit 3b5499b9 by wenyang Committed by akexiu

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

parent ef8eb42b
......@@ -294,7 +294,7 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(practitionerId,null);
if(null == findByObjSortable ){
resp.setCommonResult(new CommonResult(false,ZHBErrorConfig.getErrorInfo("630028")));
return resp;
// return resp;
}
// 获取本月第一天
Calendar cal = Calendar.getInstance();
......@@ -354,21 +354,21 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
public int compare(PersonalPEPScore o1, PersonalPEPScore o2) {
if("1".equals(requestVO.getSortType())){
if (o1 != null && o2 != null) {
return o1.getDayScore().compareTo(o2.getDayScore());
return o2.getDayScore().compareTo(o1.getDayScore());
} else {
return o1 == null ? 1 : -1;
return o2 == null ? 1 : -1;
}
}else if("3".equals(requestVO.getSortType())){
if (o1 != null && o2 != null) {
return o1.getMonthScore().compareTo(o2.getMonthScore());
return o2.getMonthScore().compareTo(o1.getMonthScore());
} else {
return o1 == null ? 1 : -1;
return o2 == null ? 1 : -1;
}
}else{
if (o1 != null && o2 != null) {
return o1.getWeekScore().compareTo(o2.getWeekScore());
return o2.getWeekScore().compareTo(o1.getWeekScore());
} else {
return o1 == null ? 1 : -1;
return o2 == null ? 1 : -1;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment