二线出岛查询条件添加

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinewarehouse/param/QySecondlineWarehousePageParam.java

@@ -108,4 +108,10 @@ public class QySecondlineWarehousePageParam {
     @Schema(description = "记账日期结束")
     private String endAccountTime;
 
+    @Schema(description = "记账数量min")
+    private String accountNumberMin;
+
+    @Schema(description = "记账数量Max")
+    private String accountNumberMax;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinewarehouse/service/impl/QySecondlineWarehouseServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.biz.modular.qyfrontlinewarehouse.entity.QyFrontlineWarehouse;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -85,6 +86,16 @@ public class QySecondlineWarehouseServiceImpl extends ServiceImpl<QySecondlineWa
         if(ObjectUtil.isNotEmpty(qySecondlineWarehousePageParam.getStartAccountTime()) && ObjectUtil.isNotEmpty(qySecondlineWarehousePageParam.getEndAccountTime())) {
             queryWrapper.lambda().between(QySecondlineWarehouse::getAccountTime, qySecondlineWarehousePageParam.getStartAccountTime(), qySecondlineWarehousePageParam.getEndAccountTime());
         }
+
+        //计量单位查询
+        if(ObjectUtil.isNotEmpty(qySecondlineWarehousePageParam.getAccountNumberMin())) {
+            queryWrapper.lambda().ge(QySecondlineWarehouse::getAccountNumber, qySecondlineWarehousePageParam.getAccountNumberMin());
+        }
+        //计量单位查询
+        if(ObjectUtil.isNotEmpty(qySecondlineWarehousePageParam.getAccountNumberMax())) {
+            queryWrapper.lambda().le(QySecondlineWarehouse::getAccountNumber, qySecondlineWarehousePageParam.getAccountNumberMax());
+        }
+
         if(ObjectUtil.isAllNotEmpty(qySecondlineWarehousePageParam.getSortField(), qySecondlineWarehousePageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(qySecondlineWarehousePageParam.getSortOrder());
             queryWrapper.orderBy(true, qySecondlineWarehousePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),