去掉details字段。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailBaseVO.java

@@ -1,14 +1,11 @@
 package com.win.module.wms.controller.countPlan.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -30,12 +27,6 @@ public class CountPlanDetailBaseVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
-    private String itemCode;
-
-    @Schema(description = "备注")
-    private String remark;
-
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
@@ -43,12 +34,6 @@ public class CountPlanDetailBaseVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "计划数量")
-    private BigDecimal planQty;
-
-    @Schema(description = "计量单位")
-    private String uom;
-
     @Schema(description = "最后更新时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime updateTime;
@@ -56,7 +41,4 @@ public class CountPlanDetailBaseVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
-    @Schema(description = "是否可用")
-    private String available;
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailExcelVO.java

@@ -6,7 +6,6 @@ import com.win.framework.excel.core.convert.DictConvert;
 import com.win.module.wms.enums.DictTypeConstants;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 
@@ -28,16 +27,6 @@ public class CountPlanDetailExcelVO {
     @ExcelProperty("单据号")
     private String number;
 
-    @ExcelProperty("物品代码")
-    private String itemCode;
-
-    @ExcelProperty("计划数量")
-    private BigDecimal planQty;
-
-    @ExcelProperty(value = "计量单位", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.UOM)
-    private String uom;
-
     @ExcelProperty("最后更新时间")
     private LocalDateTime updateTime;
 
@@ -47,9 +36,6 @@ public class CountPlanDetailExcelVO {
     @ExcelProperty("是否可用")
     private String available;
 
-    @ExcelProperty("备注")
-    private String remark;
-
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailExportReqVO.java

@@ -1,14 +1,11 @@
 package com.win.module.wms.controller.countPlan.vo;
 
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.win.framework.common.pojo.PageParam;
+import lombok.Data;
-import java.time.LocalDateTime;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 盘点计划子 Excel 导出 Request VO，参数和 CountPlanDetailPageReqVO 是一致的")
@@ -24,12 +21,6 @@ public class CountPlanDetailExportReqVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
-    private String itemCode;
-
-    @Schema(description = "备注")
-    private String remark;
-
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
@@ -37,12 +28,6 @@ public class CountPlanDetailExportReqVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "计划数量")
-    private BigDecimal planQty;
-
-    @Schema(description = "计量单位")
-    private String uom;
-
     @Schema(description = "最后更新时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] updateTime;
@@ -50,7 +35,7 @@ public class CountPlanDetailExportReqVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
-    @Schema(description = "是否可用")
+    @Schema(description = "主表ID")
-    private String available;
+    private Long masterId;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailPageReqVO.java

@@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -27,12 +26,6 @@ public class CountPlanDetailPageReqVO extends PageParam {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
-    private String itemCode;
-
-    @Schema(description = "备注")
-    private String remark;
-
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
@@ -40,12 +33,6 @@ public class CountPlanDetailPageReqVO extends PageParam {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "计划数量")
-    private BigDecimal planQty;
-
-    @Schema(description = "计量单位")
-    private String uom;
-
     @Schema(description = "最后更新时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] updateTime;
@@ -53,9 +40,6 @@ public class CountPlanDetailPageReqVO extends PageParam {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
-    @Schema(description = "是否可用")
-    private String available;
-
     @Schema(description = "主表ID")
     private Long masterId;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java

@@ -1,15 +1,11 @@
 package com.win.module.wms.controller.countPlan.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -41,9 +37,6 @@ public class CountPlanMainBaseVO {
     @Schema(description = "库位忽略名单")
     private String ignoreListOfLocation;
 
-    @Schema(description = "盘点范围列表")
-    private String scopeList;
-
     @Schema(description = "单据号")
     private String number;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java

@@ -39,9 +39,6 @@ public class CountPlanMainExcelVO {
     @ExcelProperty("库位忽略名单")
     private String ignoreListOfLocation;
 
-    @ExcelProperty("盘点范围列表")
-    private String scopeList;
-
     @ExcelProperty("单据号")
     private String number;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExportReqVO.java

@@ -33,9 +33,6 @@ public class CountPlanMainExportReqVO {
     @Schema(description = "库位忽略名单")
     private String ignoreListOfLocation;
 
-    @Schema(description = "盘点范围列表")
-    private String scopeList;
-
     @Schema(description = "单据号")
     private String number;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainPageReqVO.java

@@ -35,9 +35,6 @@ public class CountPlanMainPageReqVO extends PageParam {
     @Schema(description = "库位忽略名单")
     private String ignoreListOfLocation;
 
-    @Schema(description = "盘点范围列表")
-    private String scopeList;
-
     @Schema(description = "单据号")
     private String number;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countPlan/CountPlanMainConvert.java

@@ -41,7 +41,6 @@ public interface CountPlanMainConvert {
             @Mapping(source = "mainDO.number", target = "number"),
             @Mapping(source = "mainDO.remark", target = "remark"),
             @Mapping(source = "mainDO.available", target = "available"),
-            @Mapping(source = "detailDO.remark", target = "remarkDetail"),
             @Mapping(source = "mainDO.createTime", target = "createTime"),
             @Mapping(source = "mainDO.creator", target = "creator"),
             @Mapping(source = "mainDO.updateTime", target = "updateTime"),

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java

@@ -49,10 +49,6 @@ public class CountJobMainDO extends BaseDO {
      * 库位代码
      */
     private String locationCode;
-    /**
-     * 明细
-     */
-    private String details;
     /**
      * 申请时间
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanDetailDO.java

@@ -1,12 +1,10 @@
 package com.win.module.wms.dal.dataobject.countPlan;
 
-import lombok.*;
+import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.*;
+import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import com.sun.xml.bind.v2.TODO;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
 /**
  * 盘点计划子 DO
@@ -45,35 +43,9 @@ public class CountPlanDetailDO extends BaseDO {
      * 单据号
      */
     private String number;
-    /**
-     * 物品代码
-     */
-    private String itemCode;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 地点ID
-     */
-    private String siteId;
-    /**
-     * 计划数量
-     */
-    private BigDecimal planQty;
-    /**
-     * 计量单位
-     *
-     * 枚举 {@link TODO uom 对应的类}
-     */
-    private String uom;
     /**
      * 并发乐观锁
      */
     private String concurrencyStamp;
-    /**
-     * 是否可用
-     */
-    private String available;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java

@@ -1,14 +1,13 @@
 package com.win.module.wms.dal.dataobject.countPlan;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 盘点计划主 DO
@@ -57,10 +56,6 @@ public class CountPlanMainDO extends BaseDO {
      * 库位忽略名单
      */
     private String ignoreListOfLocation;
-    /**
-     * 盘点范围列表
-     */
-    private String scopeList;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordMainDO.java

@@ -51,10 +51,6 @@ public class CountRecordMainDO extends BaseDO {
      * 仓库代码
      */
     private String warehouseCode;
-    /**
-     * 明细
-     */
-    private String details;
     /**
      * 出库事务类型
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java

@@ -46,10 +46,6 @@ public class CountRequestMainDO extends BaseDO {
      * 仓库代码
      */
     private String warehouseCode;
-    /**
-     * details
-     */
-    private String details;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java

@@ -128,10 +128,6 @@ public class InspectJobMainDO extends BaseDO {
      * 到库位类型范围
      */
     private String toLocationTypes;
-    /**
-     * 明细
-     */
-    private String details;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordMainDO.java

@@ -93,10 +93,6 @@ public class InspectRecordMainDO extends BaseDO {
      * 枚举 {@link TODO interface_type 对应的类}
      */
     private String interfaceType;
-    /**
-     * 明细
-     */
-    private String details;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestMainDO.java

@@ -36,10 +36,6 @@ public class InspectRequestMainDO extends BaseDO {
      * 供应商代码
      */
     private String supplierCode;
-    /**
-     * details
-     */
-    private String details;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobMainDO.java

@@ -73,10 +73,6 @@ public class PurchasereceiptJobMainDO extends BaseDO {
      * 到仓库代码
      */
     private String toWarehouseCode;
-    /**
-     * 明细
-     */
-    private String details;
     /**
      * 申请时间
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchasereceiptRecordMainDO.java

@@ -76,10 +76,6 @@ public class PurchasereceiptRecordMainDO extends BaseDO {
      * 到仓库代码
      */
     private String toWarehouseCode;
-    /**
-     * 明细
-     */
-    private String details;
     /**
      * 出库事务类型
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRequest/PurchasereceiptRequestMainDO.java

@@ -1,13 +1,12 @@
 package com.win.module.wms.dal.dataobject.purchasereceiptRequest;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
+
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 采购收货申请主 DO
@@ -82,10 +81,6 @@ public class PurchasereceiptRequestMainDO extends BaseDO {
      * 到月台代码
      */
     private String toDockCode;
-    /**
-     * details
-     */
-    private String details;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobMainDO.java

@@ -76,10 +76,6 @@ public class PurchasereturnJobMainDO extends BaseDO {
      * 到仓库代码
      */
     private String toWarehouseCode;
-    /**
-     * 明细
-     */
-    private String details;
     /**
      * 申请时间
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRecord/PurchasereturnRecordMainDO.java

@@ -81,10 +81,6 @@ public class PurchasereturnRecordMainDO extends BaseDO {
      * 到仓库代码
      */
     private String toWarehouseCode;
-    /**
-     * 明细
-     */
-    private String details;
     /**
      * 出库事务类型
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestMainDO.java

@@ -1,10 +1,12 @@
 package com.win.module.wms.dal.dataobject.purchasereturnRequest;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 采购退货申请主 DO
@@ -65,10 +67,6 @@ public class PurchasereturnRequestMainDO extends BaseDO {
      * 到仓库代码
      */
     private String toWarehouseCode;
-    /**
-     * details
-     */
-    private String details;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobMainDO.java

@@ -39,10 +39,6 @@ public class PutawayJobMainDO extends BaseDO {
      * 从仓库代码
      */
     private String fromWarehouseCode;
-    /**
-     * 明细
-     */
-    private String details;
     /**
      * 申请时间
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRecord/PutawayRecordMainDO.java

@@ -41,10 +41,6 @@ public class PutawayRecordMainDO extends BaseDO {
      * 供应商代码
      */
     private String supplierCode;
-    /**
-     * 明细
-     */
-    private String details;
     /**
      * 出库事务类型
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestMainDO.java

@@ -46,10 +46,6 @@ public class PutawayRequestMainDO extends BaseDO {
      * 从库区代码范围
      */
     private String fromAreaCodes;
-    /**
-     * details
-     */
-    private String details;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanDetailMapper.java

@@ -26,34 +26,27 @@ public interface CountPlanDetailMapper extends BaseMapperX<CountPlanDetailDO> {
                 .eqIfPresent(CountPlanDetailDO::getType, reqVO.getType())
                 .eqIfPresent(CountPlanDetailDO::getValue, reqVO.getValue())
                 .eqIfPresent(CountPlanDetailDO::getNumber, reqVO.getNumber())
-                .eqIfPresent(CountPlanDetailDO::getItemCode, reqVO.getItemCode())
-                .eqIfPresent(CountPlanDetailDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(CountPlanDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CountPlanDetailDO::getCreator, reqVO.getCreator())
-                .eqIfPresent(CountPlanDetailDO::getPlanQty, reqVO.getPlanQty())
-                .eqIfPresent(CountPlanDetailDO::getUom, reqVO.getUom())
                 .betweenIfPresent(CountPlanDetailDO::getUpdateTime, reqVO.getUpdateTime())
                 .eqIfPresent(CountPlanDetailDO::getUpdater, reqVO.getUpdater())
-                .eqIfPresent(CountPlanDetailDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(CountPlanDetailDO::getId));
     }
+
     default PageResult<CountPlanDetailDO> selectSenior(CustomConditions conditions) {
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));
     }
+
     default List<CountPlanDetailDO> selectList(CountPlanDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<CountPlanDetailDO>()
+                .eqIfPresent(CountPlanDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CountPlanDetailDO::getType, reqVO.getType())
                 .eqIfPresent(CountPlanDetailDO::getValue, reqVO.getValue())
                 .eqIfPresent(CountPlanDetailDO::getNumber, reqVO.getNumber())
-                .eqIfPresent(CountPlanDetailDO::getItemCode, reqVO.getItemCode())
-                .eqIfPresent(CountPlanDetailDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(CountPlanDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CountPlanDetailDO::getCreator, reqVO.getCreator())
-                .eqIfPresent(CountPlanDetailDO::getPlanQty, reqVO.getPlanQty())
-                .eqIfPresent(CountPlanDetailDO::getUom, reqVO.getUom())
                 .betweenIfPresent(CountPlanDetailDO::getUpdateTime, reqVO.getUpdateTime())
                 .eqIfPresent(CountPlanDetailDO::getUpdater, reqVO.getUpdater())
-                .eqIfPresent(CountPlanDetailDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(CountPlanDetailDO::getId));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanMainMapper.java

@@ -28,7 +28,6 @@ public interface CountPlanMainMapper extends BaseMapperX<CountPlanMainDO> {
                 .eqIfPresent(CountPlanMainDO::getLimitedValue, reqVO.getLimitedValue())
                 .eqIfPresent(CountPlanMainDO::getIgnoreListOfItem, reqVO.getIgnoreListOfItem())
                 .eqIfPresent(CountPlanMainDO::getIgnoreListOfLocation, reqVO.getIgnoreListOfLocation())
-                .eqIfPresent(CountPlanMainDO::getScopeList, reqVO.getScopeList())
                 .eqIfPresent(CountPlanMainDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CountPlanMainDO::getBusinessType, reqVO.getBusinessType())
                 .eqIfPresent(CountPlanMainDO::getRemark, reqVO.getRemark())
@@ -59,7 +58,6 @@ public interface CountPlanMainMapper extends BaseMapperX<CountPlanMainDO> {
                 .eqIfPresent(CountPlanMainDO::getLimitedValue, reqVO.getLimitedValue())
                 .eqIfPresent(CountPlanMainDO::getIgnoreListOfItem, reqVO.getIgnoreListOfItem())
                 .eqIfPresent(CountPlanMainDO::getIgnoreListOfLocation, reqVO.getIgnoreListOfLocation())
-                .eqIfPresent(CountPlanMainDO::getScopeList, reqVO.getScopeList())
                 .eqIfPresent(CountPlanMainDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CountPlanMainDO::getBusinessType, reqVO.getBusinessType())
                 .eqIfPresent(CountPlanMainDO::getRemark, reqVO.getRemark())