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

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java

@@ -3045,6 +3045,20 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
     })
     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)
     @Select({
             "<script>",

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/OrderQueryService.java

@@ -232,6 +232,7 @@ public interface OrderQueryService {
      */
     PageResult<SearchBackDto> orderNoSearch(String key, PageParam param);
 
+    PageResult<SearchBackDto> orderNoSearchOffer(String key, PageParam param);
 
     /**
      * 提单号分页检索功能

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java

@@ -1514,6 +1514,13 @@ public class OrderQueryServiceImpl implements OrderQueryService {
         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
     public PageResult<SearchBackDto> billNoSearch(String key, PageParam param) {
         IPage<SearchBackDto> mpPage = MyBatisUtils.buildPage(param);

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/order/OrderController.java

@@ -717,6 +717,12 @@ public class OrderController {
         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")
     @ApiOperation("提单号检索功能")
     public CommonResult<PageResult<SearchBackDto>> billNoSearch(@RequestParam("key") String key, PageParam param) {