提交 2c65385a authored 作者: liuhaiquan's avatar liuhaiquan

修改客诉运单列表

上级 3ffa74b4
...@@ -160,5 +160,5 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int ...@@ -160,5 +160,5 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
List<OrderChild> selectListWithEmptyCarList(); List<OrderChild> selectListWithEmptyCarList();
Page<OrderChild> getMonthAgoByTruckNos(List<String> truckNos, LocalDateTime monthAgo, PageParam param); Page<OrderChild> getMonthAgoByTruckNos(Long userNo, LocalDateTime monthAgo, PageParam param);
} }
...@@ -499,10 +499,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild, ...@@ -499,10 +499,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
} }
@Override @Override
public Page<OrderChild> getMonthAgoByTruckNos(List<String> truckNos, LocalDateTime monthAgo, PageParam param) { public Page<OrderChild> getMonthAgoByTruckNos(Long userNo, LocalDateTime monthAgo, PageParam param) {
LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper<>();
query.in(OrderChild ::getTruckNo,truckNos); query.eq(OrderChild :: getDriverUserNo,userNo).or().eq(OrderChild :: getTruckOwnUserNo,userNo);
query.ge(OrderChild :: getCreateTime,monthAgo); query.ge(OrderChild :: getCreateTime,monthAgo);
query.orderByDesc(OrderChild :: getCreateTime);
return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query); return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
} }
} }
...@@ -2084,13 +2084,8 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -2084,13 +2084,8 @@ public class OrderChildServiceImpl implements OrderChildService {
@Override @Override
public IPage<CustomerComplaintOrderChildVO> pageCustomerComplaintOrderChild(PageParam param) { public IPage<CustomerComplaintOrderChildVO> pageCustomerComplaintOrderChild(PageParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
List<DriverTruckAppVo> driverTruckList = userService.driverTruckList(loginUserInfo.getUserNo()).orNull();
if(CollectionUtils.isEmpty(driverTruckList)){
return new Page<>();
}
List<String> truckNos = driverTruckList.stream().map(DriverTruckAppVo :: getTruckNo).collect(Collectors.toList());
LocalDateTime monthAgo = LocalDateTime.now().minusMonths(1); LocalDateTime monthAgo = LocalDateTime.now().minusMonths(1);
Page<OrderChild> page = orderChildDao.getMonthAgoByTruckNos(truckNos,monthAgo,param); Page<OrderChild> page = orderChildDao.getMonthAgoByTruckNos(loginUserInfo.getUserNo(),monthAgo,param);
Page<CustomerComplaintOrderChildVO> returnPage = orderChildStruct.covertPageCustomerComplaintOrderChildVO( Page<CustomerComplaintOrderChildVO> returnPage = orderChildStruct.covertPageCustomerComplaintOrderChildVO(
page); page);
if(CollectionUtils.isNotEmpty(returnPage.getRecords())){ if(CollectionUtils.isNotEmpty(returnPage.getRecords())){
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论