소스 검색

一线径予放行业务记账管理查询条件添加

wenjinbiao 6 달 전
부모
커밋
a66fe4aca6

+ 8 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyfrontlinewarehouse/param/QyFrontlineWarehousePageParam.java

@@ -108,4 +108,12 @@ public class QyFrontlineWarehousePageParam {
     @Schema(description = "记账日期结束")
     private String endAccountTime;
 
+    @Schema(description = "记账数量min")
+    private String accountNumberMin;
+
+    @Schema(description = "记账数量Max")
+    private String accountNumberMax;
+
+    @Schema(description = "出库&入库类型(0入库,1出库)")
+    private String warehouseType;
 }

+ 15 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyfrontlinewarehouse/service/impl/QyFrontlineWarehouseServiceImpl.java

@@ -85,6 +85,21 @@ public class QyFrontlineWarehouseServiceImpl extends ServiceImpl<QyFrontlineWare
         if(ObjectUtil.isNotEmpty(qyFrontlineWarehousePageParam.getStartAccountTime()) && ObjectUtil.isNotEmpty(qyFrontlineWarehousePageParam.getEndAccountTime())) {
             queryWrapper.lambda().between(QyFrontlineWarehouse::getAccountTime, qyFrontlineWarehousePageParam.getStartAccountTime(), qyFrontlineWarehousePageParam.getEndAccountTime());
         }
+
+        //计量单位查询
+        if(ObjectUtil.isNotEmpty(qyFrontlineWarehousePageParam.getAccountNumberMin())) {
+            queryWrapper.lambda().ge(QyFrontlineWarehouse::getAccountNumber, qyFrontlineWarehousePageParam.getAccountNumberMin());
+        }
+        //计量单位查询
+        if(ObjectUtil.isNotEmpty(qyFrontlineWarehousePageParam.getAccountNumberMax())) {
+            queryWrapper.lambda().le(QyFrontlineWarehouse::getAccountNumber, qyFrontlineWarehousePageParam.getAccountNumberMax());
+        }
+
+        //账单类型查询
+        if(ObjectUtil.isNotEmpty(qyFrontlineWarehousePageParam.getWarehouseType())){
+            queryWrapper.lambda().eq(QyFrontlineWarehouse::getWarehouseType,qyFrontlineWarehousePageParam.getWarehouseType());
+        }
+
         if(ObjectUtil.isAllNotEmpty(qyFrontlineWarehousePageParam.getSortField(), qyFrontlineWarehousePageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(qyFrontlineWarehousePageParam.getSortOrder());
             queryWrapper.orderBy(true, qyFrontlineWarehousePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),