Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

2023-03-27 23:38:24 +08:00
parent 448b5f73fe 066deceadc
commit d879bd1e9b
4 changed files with 65 additions and 26 deletions
@@ -338,7 +338,7 @@ public class CertificationInventoryJob implements Job {
            // 只要早于当前日期都算逾期
            boolean flag = false;
            if(data.getEndTime() != null){
-                flag = (data.getEndTime().before(currentDate));
+                flag = (data.getEndTime().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getEndTime())));
            }
            return flag;
        }).collect(Collectors.toList());