外仓看板过期信息修改

src/main/java/com/neotel/smfcore/custom/lizhen/kanban/outer/OuterKanbanController.java

@@ -173,19 +173,23 @@ public class OuterKanbanController {
      */
      */
     @RequestMapping("/getExpireInfo")
     @RequestMapping("/getExpireInfo")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultBean getExpireInfo() {
+    public ResultBean getExpireInfo() throws ParseException {
         Long lastSaveTime = expireMap.get("lastSaveTime");
         Long lastSaveTime = expireMap.get("lastSaveTime");
         if (lastSaveTime == null || System.currentTimeMillis() - lastSaveTime >= 1000 * 60 * 60) {
         if (lastSaveTime == null || System.currentTimeMillis() - lastSaveTime >= 1000 * 60 * 60) {
             expireMap.put("zeroToServen", 0l);
             expireMap.put("zeroToServen", 0l);
             expireMap.put("servenToThirty", 0l);
             expireMap.put("servenToThirty", 0l);
             expireMap.put("expire", 0l);
             expireMap.put("expire", 0l);
             expireMap.put("noExpire", 0l);
             expireMap.put("noExpire", 0l);
-            Query query = new Query().addCriteria(Criteria.where("posName").exists(true).ne("").and("expireDate").lt(new Date()));
+            //当前时间减30天
+            Date startDate = DateUtil.addDays(new Date(), -30);
+            String startDateStr = DateUtil.toDateString(startDate, "yyyy-MM-dd");
+            startDate = DateUtil.toDate(startDateStr, "yyyy-MM-dd");
+            Query query = new Query().addCriteria(Criteria.where("posName").exists(true).ne("").and("expireDate").gte(startDate).lt(new Date()));
             List<Barcode> barcodeList = barcodeManager.findByQuery(query);
             List<Barcode> barcodeList = barcodeManager.findByQuery(query);
             long zeroToServen = barcodeList.stream().filter(item -> {
             long zeroToServen = barcodeList.stream().filter(item -> {
                 Date expireDate = item.getExpireDate();
                 Date expireDate = item.getExpireDate();
                 long days = cn.hutool.core.date.DateUtil.between(expireDate, new Date(), DateUnit.DAY) + 1;
                 long days = cn.hutool.core.date.DateUtil.between(expireDate, new Date(), DateUnit.DAY) + 1;
-                if (days >= 0 && days < 7) {
+                if (days >= 1 && days < 7) {
                     return true;
                     return true;
                 }
                 }
                 return false;
                 return false;
@@ -198,6 +202,14 @@ public class OuterKanbanController {
                 }
                 }
                 return false;
                 return false;
             }).count();
             }).count();
+            long expire = barcodeList.stream().filter(item -> {
+                Date expireDate = item.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("expireDate").gt(new Date()).and("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")));
             orCriList.add(Criteria.where("expireDate").gt(new Date()).and("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")));
             orCriList.add(Criteria.where("expireDate").exists(false).and("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")));
             orCriList.add(Criteria.where("expireDate").exists(false).and("posName").exists(true).ne("").and("partNumber").nin(Arrays.asList("CS", "CM", "CB")));
@@ -205,7 +217,7 @@ public class OuterKanbanController {
             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", barcodeList == null ? 0l : (long) barcodeList.size());
+            expireMap.put("expire", expire);
             expireMap.put("lastSaveTime", System.currentTimeMillis());
             expireMap.put("lastSaveTime", System.currentTimeMillis());
         }
         }
         return ResultBean.newOkResult(expireMap);
         return ResultBean.newOkResult(expireMap);