fix:87762

This commit is contained in:
梁琦涛
2024-08-01 19:10:38 +08:00
parent c769ef8243
commit be09b5a95f
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -61,7 +62,7 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa
// 获取当前日期往前90天以内创建的外部标准
LambdaQueryWrapper<LawsDomesticStandard> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.ne(LawsDomesticStandard::getStandardState, OutStandardStateEnum.ABOLISH.getStateValue());
queryWrapper.between(LawsDomesticStandard::getCreateTime, LocalDate.now().minusDays(90), LocalDate.now());
queryWrapper.between(LawsDomesticStandard::getCreateTime, LocalDateTime.now().minusDays(90), LocalDateTime.now());
queryWrapper.orderByDesc(LawsDomesticStandard::getCreateTime);
IPage<LawsDomesticStandard> page = new Page<>(pageNo, pageSize);
return domesticStandardService.page(page, queryWrapper);
@@ -72,7 +73,7 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa
// 获取当前日期往前90天以内创建的企业标准
LambdaQueryWrapper<LawsEnterpriseStandard> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.ne(LawsEnterpriseStandard::getStandardState, StandardStateEnum.ABOLISH.getStateValue());
queryWrapper.between(LawsEnterpriseStandard::getCreateTime, LocalDate.now().minusDays(90), LocalDate.now());
queryWrapper.between(LawsEnterpriseStandard::getCreateTime, LocalDateTime.now().minusDays(90), LocalDateTime.now());
queryWrapper.orderByDesc(LawsEnterpriseStandard::getCreateTime);
IPage<LawsEnterpriseStandard> page = new Page<>(pageNo, pageSize);
return enterpriseStandardService.page(page, queryWrapper);
@@ -83,7 +84,7 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa
// 获取当前日期往后180天以内实施的外部标准
LambdaQueryWrapper<LawsDomesticStandard> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.ne(LawsDomesticStandard::getStandardState, OutStandardStateEnum.ABOLISH.getStateValue());
queryWrapper.between(LawsDomesticStandard::getImplementationDate, LocalDate.now(), LocalDate.now().plusDays(180));
queryWrapper.between(LawsDomesticStandard::getImplementationDate, LocalDateTime.now(), LocalDateTime.now().plusDays(180));
queryWrapper.orderByAsc(LawsDomesticStandard::getImplementationDate);
IPage<LawsDomesticStandard> page = new Page<>(pageNo, pageSize);
return domesticStandardService.page(page, queryWrapper);