4/8 优化1.3 追溯码采集核对

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);
     }
 
+
+
+
 }

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;
 
 
 

src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java

@@ -206,8 +206,6 @@ public class IoCollectOrderResponse {
 
     /**
      * 是否达标
-     * 1 是
-     * 2 否
      */
     private Integer storard;
 

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}, '%')