|
@@ -287,7 +287,11 @@ public class AdminController {
|
|
|
wrapper.eq(Task::getFamilyId, familyId);
|
|
wrapper.eq(Task::getFamilyId, familyId);
|
|
|
}
|
|
}
|
|
|
wrapper.orderByDesc(Task::getCreatedAt);
|
|
wrapper.orderByDesc(Task::getCreatedAt);
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
|
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
|
|
+ List<Map<String, String>> taskSortSpecs = params.get("sort") != null
|
|
|
|
|
+ ? (List<Map<String, String>>) params.get("sort")
|
|
|
|
|
+ : null;
|
|
|
|
|
+ SortUtil.applySort(wrapper, taskSortSpecs, null);
|
|
|
Page<Task> result = taskMapper.selectPage(pageParam, wrapper);
|
|
Page<Task> result = taskMapper.selectPage(pageParam, wrapper);
|
|
|
|
|
|
|
|
// 为每条任务填充执行者名称
|
|
// 为每条任务填充执行者名称
|
|
@@ -1565,7 +1569,11 @@ public class AdminController {
|
|
|
}
|
|
}
|
|
|
wrapper.orderByDesc(AssessmentAppointment::getCreatedAt);
|
|
wrapper.orderByDesc(AssessmentAppointment::getCreatedAt);
|
|
|
|
|
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
|
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
|
|
+ List<Map<String, String>> sortSpecs = params.get("sort") != null
|
|
|
|
|
+ ? (List<Map<String, String>>) params.get("sort")
|
|
|
|
|
+ : null;
|
|
|
|
|
+ SortUtil.applySort(wrapper, sortSpecs, null);
|
|
|
Page<AssessmentAppointment> result = assessmentAppointmentMapper.selectPage(pageParam, wrapper);
|
|
Page<AssessmentAppointment> result = assessmentAppointmentMapper.selectPage(pageParam, wrapper);
|
|
|
|
|
|
|
|
java.util.List<Map<String, Object>> list = new java.util.ArrayList<>();
|
|
java.util.List<Map<String, Object>> list = new java.util.ArrayList<>();
|