|
|
@@ -124,7 +124,7 @@ public class GatekeeperOrderService {
|
|
|
gatekeeperOrderPageResult = filterGatekeeperOrderResp(param, gatekeeperOrderPageResult);
|
|
|
//过滤山上/山下门卫数据
|
|
|
List<GatekeeperOrderResp> filterResult = filter(gatekeeperOrderPageResult);
|
|
|
- //排序
|
|
|
+
|
|
|
return PageDataResult.success(param.getPageNum(), param.getPageSize(), pageByStatus.getTotal(), filterResult);
|
|
|
}
|
|
|
|
|
|
@@ -180,9 +180,7 @@ public class GatekeeperOrderService {
|
|
|
*/
|
|
|
private LambdaQueryWrapper<KwtGatekeeperWaybillOrder> buildBaseQueryWrapper(GatekeeperOrderQueryParam param) {
|
|
|
LambdaQueryWrapper<KwtGatekeeperWaybillOrder> wrapper = Wrappers.<KwtGatekeeperWaybillOrder>lambdaQuery()
|
|
|
- .eq(KwtGatekeeperWaybillOrder::getEntId, param.getEntId())
|
|
|
- .orderByDesc(KwtGatekeeperWaybillOrder::getCreateTime)
|
|
|
- .orderByDesc(KwtGatekeeperWaybillOrder::getId);
|
|
|
+ .eq(KwtGatekeeperWaybillOrder::getEntId, param.getEntId());
|
|
|
|
|
|
//待进场
|
|
|
if (param.getStatus() == 1) {
|