Commit 84e7728e authored by honghy's avatar honghy Committed by wux

bug308 (生产bug)【报价列表-结果】报价结果页面中,“关联订单”没有过滤掉已绑定订单的数据

parent 480f40af
...@@ -3046,6 +3046,20 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -3046,6 +3046,20 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
}) })
IPage<SearchBackDto> orderNoSearch(IPage<SearchBackDto> mpPage, @Param("keyValue") String key); IPage<SearchBackDto> orderNoSearch(IPage<SearchBackDto> mpPage, @Param("keyValue") String key);
@ResultType(SearchBackDto.class)
@Select({
"<script>",
"SELECT" ,
"s.order_id,s.order_no as value" ,
"FROM ecw_order s" ,
"WHERE s.deleted =0" ,
"AND s.order_no LIKE concat('%',#{keyValue},'%')",
"AND NOT EXISTS (SELECT 1 FROM ecw_offer a WHERE a.order_id = s.order_id and a.deleted = 0)",
"</script>"
})
IPage<SearchBackDto> orderNoSearchOffer(IPage<SearchBackDto> mpPage, @Param("keyValue") String key);
@ResultType(SearchBackDto.class) @ResultType(SearchBackDto.class)
@Select({ @Select({
"<script>", "<script>",
......
...@@ -234,6 +234,7 @@ public interface OrderQueryService { ...@@ -234,6 +234,7 @@ public interface OrderQueryService {
*/ */
PageResult<SearchBackDto> orderNoSearch(String key, PageParam param); PageResult<SearchBackDto> orderNoSearch(String key, PageParam param);
PageResult<SearchBackDto> orderNoSearchOffer(String key, PageParam param);
/** /**
* 提单号分页检索功能 * 提单号分页检索功能
......
...@@ -1546,6 +1546,13 @@ public class OrderQueryServiceImpl implements OrderQueryService { ...@@ -1546,6 +1546,13 @@ public class OrderQueryServiceImpl implements OrderQueryService {
return PageResult.of(mpPage); return PageResult.of(mpPage);
} }
@Override
public PageResult<SearchBackDto> orderNoSearchOffer(String key, PageParam param) {
IPage<SearchBackDto> mpPage = MyBatisUtils.buildPage(param);
orderMapper.orderNoSearchOffer(mpPage, key);
return PageResult.of(mpPage);
}
@Override @Override
public PageResult<SearchBackDto> billNoSearch(String key, PageParam param) { public PageResult<SearchBackDto> billNoSearch(String key, PageParam param) {
IPage<SearchBackDto> mpPage = MyBatisUtils.buildPage(param); IPage<SearchBackDto> mpPage = MyBatisUtils.buildPage(param);
......
...@@ -718,6 +718,12 @@ public class OrderController { ...@@ -718,6 +718,12 @@ public class OrderController {
return success(orderQueryService.orderNoSearch(key, param)); return success(orderQueryService.orderNoSearch(key, param));
} }
@GetMapping("/orderNoSearchOffer")
@ApiOperation("订单号检索功能(报价单)")
public CommonResult<PageResult<SearchBackDto>> orderNoSearchOffer(@RequestParam("key") String key, PageParam param) {
return success(orderQueryService.orderNoSearchOffer(key, param));
}
@GetMapping("/billNoSearch") @GetMapping("/billNoSearch")
@ApiOperation("提单号检索功能") @ApiOperation("提单号检索功能")
public CommonResult<PageResult<SearchBackDto>> billNoSearch(@RequestParam("key") String key, PageParam param) { public CommonResult<PageResult<SearchBackDto>> billNoSearch(@RequestParam("key") String key, PageParam param) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment