|
|
@@ -361,7 +361,9 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
|
|
|
}else {
|
|
|
LambdaQueryWrapper<ApplicationProcedureTemporary> wrapper=new LambdaQueryWrapper<>();
|
|
|
wrapper.eq(ObjectUtils.isNotEmpty(status),ApplicationProcedureTemporary::getStatus,status)
|
|
|
- .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime);
|
|
|
+ .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
|
|
|
+ .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
|
|
|
+
|
|
|
pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
|
|
|
return CommonResult.ok(pageList);
|
|
|
}
|
|
|
@@ -382,14 +384,16 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
|
|
|
wrapper.eq(ApplicationProcedureTemporary::getStatus,status);
|
|
|
}
|
|
|
|
|
|
- wrapper.between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime);
|
|
|
+ wrapper.between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
|
|
|
+ .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
|
|
|
pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
|
|
|
return CommonResult.ok(pageList);
|
|
|
|
|
|
}
|
|
|
LambdaQueryWrapper<ApplicationProcedureTemporary> wrapper=new LambdaQueryWrapper<>();
|
|
|
wrapper.eq(ObjectUtils.isNotEmpty(status),ApplicationProcedureTemporary::getStatus,status)
|
|
|
- .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime);
|
|
|
+ .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
|
|
|
+ .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
|
|
|
pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
|
|
|
return CommonResult.ok(pageList);
|
|
|
|