提交 40295c8a authored 作者: liuhaiquan's avatar liuhaiquan

修改货主端结算单列表查询条件

上级 31c8e3b3
...@@ -38,7 +38,7 @@ public class CarrierSettlementOwnerController { ...@@ -38,7 +38,7 @@ public class CarrierSettlementOwnerController {
@ApiOperation(value = "结算单列表(货主)",notes = "<br>By:刘海泉") @ApiOperation(value = "承运端-结算单列表(货主)",notes = "<br>By:刘海泉")
@PostMapping("/pageCarrierSettlementOwner") @PostMapping("/pageCarrierSettlementOwner")
@UnitCovert(param = false) @UnitCovert(param = false)
public Result<PageData<CarrierPageSettlementOwnerVO>> pageCarrierSettlementOwner(@RequestBody @Validated PageCarrierSettlementOwnerParam param) { public Result<PageData<CarrierPageSettlementOwnerVO>> pageCarrierSettlementOwner(@RequestBody @Validated PageCarrierSettlementOwnerParam param) {
......
...@@ -96,7 +96,7 @@ public class OwnerSettlementOwnerController { ...@@ -96,7 +96,7 @@ public class OwnerSettlementOwnerController {
return null; return null;
} }
@ApiOperation(value = "结算单列表") @ApiOperation(value = "货主端-结算单列表" ,notes = "<br>By:李瑞新")
@PostMapping("/pageSettlementOwner") @PostMapping("/pageSettlementOwner")
public Result<PageData<OwnerPageSettlementOwnerVO>> pageSettlementOwner(@RequestBody @Validated PageOwnerSettlementParam param){ public Result<PageData<OwnerPageSettlementOwnerVO>> pageSettlementOwner(@RequestBody @Validated PageOwnerSettlementParam param){
IPage<OwnerPageSettlementOwnerVO> page = settlementOwnerService.pageSettlementOwner(param); IPage<OwnerPageSettlementOwnerVO> page = settlementOwnerService.pageSettlementOwner(param);
......
...@@ -82,8 +82,9 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S ...@@ -82,8 +82,9 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
} }
@Override @Override
public IPage<SettlementOwner> pageSettlementOwner(PageOwnerSettlementParam param) { public IPage<SettlementOwner> pageSettlementOwner(Long userNo,PageOwnerSettlementParam param) {
LambdaQueryWrapper<SettlementOwner> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SettlementOwner> query = new LambdaQueryWrapper<>();
query.eq(SettlementOwner :: getOwnerUserNo,userNo);
if(Objects.nonNull(param.getOrderNo())){ if(Objects.nonNull(param.getOrderNo())){
query.eq(SettlementOwner :: getOrderNo,param.getOrderNo()); query.eq(SettlementOwner :: getOrderNo,param.getOrderNo());
} }
......
...@@ -24,5 +24,5 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl ...@@ -24,5 +24,5 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
Optional<SettlementOwner> selectBySettlementNo(@Param("settlementNo")String settlementNo); Optional<SettlementOwner> selectBySettlementNo(@Param("settlementNo")String settlementNo);
IPage<SettlementOwner> pageSettlementOwner(PageOwnerSettlementParam param); IPage<SettlementOwner> pageSettlementOwner(Long userNo,PageOwnerSettlementParam param);
} }
...@@ -195,7 +195,8 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService { ...@@ -195,7 +195,8 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
@Override @Override
public IPage<OwnerPageSettlementOwnerVO> pageSettlementOwner(PageOwnerSettlementParam param) { public IPage<OwnerPageSettlementOwnerVO> pageSettlementOwner(PageOwnerSettlementParam param) {
IPage<SettlementOwner> page = settlementOwnerDao.pageSettlementOwner(param); Long userNo = TokenUtil.getLoginUserInfo().getUserNo();
IPage<SettlementOwner> page = settlementOwnerDao.pageSettlementOwner(userNo,param);
List<OwnerPageSettlementOwnerVO> list = settlementOwnerStruct.convertOwnerList(page.getRecords()); List<OwnerPageSettlementOwnerVO> list = settlementOwnerStruct.convertOwnerList(page.getRecords());
IPage<OwnerPageSettlementOwnerVO> result = new Page().setRecords(list).setTotal(page.getTotal()).setPages( IPage<OwnerPageSettlementOwnerVO> result = new Page().setRecords(list).setTotal(page.getTotal()).setPages(
page.getPages()); page.getPages());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论