From b97ac405b9eca47d052a9ef5b2a891f101374358 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 8 Apr 2025 22:54:27 +0800
Subject: [PATCH] =?UTF-8?q?4/8=20=E4=BC=98=E5=8C=961.3=20=E8=BF=BD?=
 =?UTF-8?q?=E6=BA=AF=E7=A0=81=E9=87=87=E9=9B=86=E6=A0=B8=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderBackupController.java        | 10 +++++++++-
 .../com/glxp/api/req/collect/CollectOrderRequest.java  |  2 +-
 .../glxp/api/res/collect/IoCollectOrderResponse.java   |  2 --
 .../mapper/collect/IoCollectOrderBizBackupMapper.xml   |  3 +++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
index b8eba9f99..d005d954b 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
@@ -223,7 +223,12 @@ public class IoCollectOrderBackupController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();
-        collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo());
+        if (StrUtil.isNotEmpty(collectOrderRequest.getBillNo())){
+            collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo());
+        }
+        if (StrUtil.isNotEmpty(collectOrderRequest.getYbbm())){
+            collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getYbbm());
+        }
         List<CollectOrderBizResponse> collectOrderBizResponses = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest);
         PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(collectOrderBizResponses);
         PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -245,4 +250,7 @@ public class IoCollectOrderBackupController extends BaseController {
         return ResultVOUtils.success(orderResponses);
     }
 
+
+
+
 }
diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
index 09f6266e5..aaba85560 100644
--- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
@@ -186,7 +186,7 @@ public class CollectOrderRequest extends ListPageRequest {
     private Integer isMatching;
 
     private Integer inAndOutType;
-
+    private String ybbm;
 
 
 
diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
index c2a9640b7..06d504040 100644
--- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
@@ -206,8 +206,6 @@ public class IoCollectOrderResponse {
 
     /**
      * 是否达标
-     * 1 是
-     * 2 否
      */
     private Integer storard;
 
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml
index 458db0b60..d56bea6e3 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml
@@ -27,6 +27,9 @@
             <if test="cpmctymc != null and cpmctymc != ''">
                 AND icobb.cpmctymc LIKE concat( #{cpmctymc}, '%')
             </if>
+            <if test="ybbm != null and ybbm != ''">
+                AND bp.ybbm  LIKE concat('%', #{ybbm}, '%')
+            </if>
             <if test="unionCode != '' and unionCode != null">
                 and (
                 bp.nameCode LIKE concat( #{unionCode}, '%')