skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java
@@ -101,9 +101,10 @@ List<SmsResultVO> dxyjList = smsRecordClient.smsSuccessList(vo); //外呼统计 DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd"); CallTaskResultVO callTaskResult = new CallTaskResultVO(); callTaskResult.setStartTime(oneDayBefore.format(formatter)); callTaskResult.setEndTime(now.format(formatter)); callTaskResult.setStartTime(oneDayBefore.format(formatter2)); callTaskResult.setEndTime(now.format(formatter2)); List<CallTaskResultVO> whtjList = (List<CallTaskResultVO>) callService.getCallResultListTemp(null, callTaskResult); HashMap<String, String> over10Params = new HashMap<>(); @@ -123,8 +124,7 @@ //昨日报汛内容 QueryWrapper queryWrapper = new QueryWrapper(); YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(queryWrapper); YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(oneDayBefore.format(formatter2)); byte[] data = null; if (MyDateUtils.isTodayInFloodSeason()) { skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.java
@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.Date; /** * @Author AIX * @Date 2024/7/8 12:34 @@ -14,7 +16,7 @@ */ public interface YwFloodReportInfoMapper extends BaseMapper<YwFloodReportInfo> { @Select("SELECT * FROM ywxt.yw_flood_report_info ORDER BY create_time DESC LIMIT 1") YwFloodReportInfo getLatestReport(@Param(Constants.WRAPPER) QueryWrapper<YwFloodReportInfo> queryWrapper); @Select("SELECT * FROM ywxt.yw_flood_report_info WHERE create_time >= #{oneDayBefore} ORDER BY create_time ASC LIMIT 1") YwFloodReportInfo getLatestReport(@Param("oneDayBefore") String oneDayBefore); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IYwFloodReportInfoService.java
@@ -10,5 +10,5 @@ * @Version 1.0 */ public interface IYwFloodReportInfoService extends BaseService<YwFloodReportInfo> { YwFloodReportInfo getLatestReport(QueryWrapper<YwFloodReportInfo> queryWrapper); YwFloodReportInfo getLatestReport(String oneDayBefore); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/YwFloodReportInfoServiceImpl.java
@@ -17,7 +17,7 @@ @AllArgsConstructor public class YwFloodReportInfoServiceImpl extends BaseServiceImpl<YwFloodReportInfoMapper, YwFloodReportInfo> implements IYwFloodReportInfoService { @Override public YwFloodReportInfo getLatestReport(QueryWrapper<YwFloodReportInfo> queryWrapper) { return baseMapper.getLatestReport(queryWrapper); public YwFloodReportInfo getLatestReport(String oneDayBefore) { return baseMapper.getLatestReport(oneDayBefore); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
@@ -140,8 +140,7 @@ List<TotalInfo> totalOver10List = sjztmdService.getTotalOverInfo(isShow, over10Params); //昨日报汛内容 QueryWrapper queryWrapper = new QueryWrapper(); YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(queryWrapper); YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(oneDayBefore.format(formatter2)); byte[] data = null; if (MyDateUtils.isTodayInFloodSeason()) {
