|
@@ -176,7 +176,8 @@ public class CompanyController {
|
|
|
}
|
|
|
if(key==1){
|
|
|
LocalDateTime now= LocalDate.now().atTime(LocalTime.MIN);
|
|
|
- queryWrapper.between("expiration_date",now,now.plusMonths(3));
|
|
|
+ LocalDateTime nowSub= now.plusDays(-2);
|
|
|
+ queryWrapper.between("expiration_date",nowSub,now.plusMonths(3));
|
|
|
queryWrapper.orderByAsc("expiration_date");
|
|
|
if (keyForIsMeal) {
|
|
|
queryWrapper.eq("set_meal", 1);
|