|
@@ -126,6 +126,13 @@ public class AnnualInspectionController {
|
|
|
@PostMapping("pageWorker")
|
|
|
@Validation(fields = {"workerId"})
|
|
|
public RestResponse pageWorker(@Val @RequestBody InspectionRequest request) {
|
|
|
+ //计划与执行: 按年检时间由近及远排序,已完成: 按年检完成时间由近及远排序
|
|
|
+ if (Objects.equals(request.getStatus(), ValuePool.INSPECTION_STATUS_TO_DO)) {
|
|
|
+ request.addAsc("plan_date");
|
|
|
+ }
|
|
|
+ if (Objects.equals(request.getStatus(), ValuePool.INSPECTION_STATUS_COMPLETE)) {
|
|
|
+ request.addAsc("finish_time");
|
|
|
+ }
|
|
|
IPage<InspectionResponse> pages = annualInspectionService.pageByCondition(request);
|
|
|
return RestResponse.success(pages);
|
|
|
}
|