|
@@ -234,6 +234,7 @@ public class Api05Controller extends BladeController {
|
|
|
query.eq(Consign::getConsignConfigId,consignConfigId);
|
|
|
query.eq(Consign::getConsignState, 2);
|
|
|
query.eq(Consign::getNowStock, 0);
|
|
|
+ query.orderByDesc(Consign::getEndTime);
|
|
|
List<Consign> list = consignService.list(query);
|
|
|
//获取用户id
|
|
|
List<Long> collect = list.stream().map(Consign::getConsignUserId).collect(Collectors.toList());
|
|
@@ -257,7 +258,7 @@ public class Api05Controller extends BladeController {
|
|
|
query.eq(PlatformAuthorization::getState, 1);
|
|
|
List<PlatformAuthorization> platformAuthorizations = paMapper.selectList(query);
|
|
|
LambdaQueryWrapper<Consign> consignLambdaQueryWrapper = Wrappers.lambdaQuery(Consign.class);
|
|
|
- consignLambdaQueryWrapper.eq(Consign::getNowStock, 0).eq(Consign::getConsignState, 2);
|
|
|
+ consignLambdaQueryWrapper.eq(Consign::getNowStock, 0).eq(Consign::getConsignState, 2).orderByDesc(Consign::getEndTime);
|
|
|
List<Consign> list = consignService.list(consignLambdaQueryWrapper);
|
|
|
ConsignListVO consignListVO = null;
|
|
|
List<ConsignListVO> consignListVOS = new ArrayList<>();
|