内仓看板过期信息修改

src/main/java/com/neotel/smfcore/custom/lizhen/kanban/inner/InnerKanbanController.java

@@ -202,7 +202,7 @@ public class InnerKanbanController {
             Date startDate = DateUtil.addDays(new Date(), -30);
             Date startDate = DateUtil.addDays(new Date(), -30);
             String startDateStr = DateUtil.toDateString(startDate, "yyyy-MM-dd");
             String startDateStr = DateUtil.toDateString(startDate, "yyyy-MM-dd");
             startDate = DateUtil.toDate(startDateStr, "yyyy-MM-dd");
             startDate = DateUtil.toDate(startDateStr, "yyyy-MM-dd");
-            Query query = new Query().addCriteria(Criteria.where("barcode").exists(true).and("barcode.expireDate").lte(startDate));
+            Query query = new Query().addCriteria(Criteria.where("barcode").exists(true).and("barcode.expireDate").gte(startDate).lt(new Date()));
             List<StoragePos> storagePosList = storagePosManager.findByQuery(query);
             List<StoragePos> storagePosList = storagePosManager.findByQuery(query);
             long zeroToServen = storagePosList.stream().filter(item -> {
             long zeroToServen = storagePosList.stream().filter(item -> {
                 Barcode barcode = item.getBarcode();
                 Barcode barcode = item.getBarcode();
@@ -223,6 +223,16 @@ public class InnerKanbanController {
                 return false;
                 return false;
             }).count();
             }).count();
 
 
+            long expire = storagePosList.stream().filter(item -> {
+                Barcode barcode = item.getBarcode();
+                Date expireDate = barcode.getExpireDate();
+                long days = cn.hutool.core.date.DateUtil.between(expireDate, new Date(), DateUnit.DAY) + 1;
+                if (days >= 1) {
+                    return true;
+                }
+                return false;
+            }).count();
+
             List<Criteria> orCriList = new ArrayList<>();
             List<Criteria> orCriList = new ArrayList<>();
             orCriList.add(Criteria.where("barcode").exists(true).and("barcode.expireDate").gt(new Date()));
             orCriList.add(Criteria.where("barcode").exists(true).and("barcode.expireDate").gt(new Date()));
             orCriList.add(Criteria.where("barcode").exists(true).and("barcode.expireDate").exists(false));
             orCriList.add(Criteria.where("barcode").exists(true).and("barcode.expireDate").exists(false));
@@ -230,7 +240,7 @@ public class InnerKanbanController {
             expireMap.put("noExpire", (long) noExpire);
             expireMap.put("noExpire", (long) noExpire);
             expireMap.put("zeroToServen", zeroToServen);
             expireMap.put("zeroToServen", zeroToServen);
             expireMap.put("servenToThirty", servenToThirty);
             expireMap.put("servenToThirty", servenToThirty);
-            expireMap.put("expire", storagePosList == null ? 0l : storagePosList.size());
+            expireMap.put("expire", expire);
             expireMap.put("lastSaveTime", System.currentTimeMillis());
             expireMap.put("lastSaveTime", System.currentTimeMillis());
         }
         }
         return ResultBean.newOkResult(expireMap);
         return ResultBean.newOkResult(expireMap);