From 4adf5ba7ffa39b8a1075d12e1ebcca6c8c7e2187 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 1 Sep 2024 17:00:08 +0800 Subject: [PATCH] fix --- .../com/iformall/service/impl/WxEnergyServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 7a9290c2c..025a4c6e1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -845,10 +845,18 @@ public class WxEnergyServiceImpl implements WxEnergyService { r.setPreTime(pre.getCreateTime()); r.setPreBy(pre.getCreateBy()); r.setPreByName(pre.getCreateByName()); + if (null != pre.getEndTime()) { + if (pre.getEndTime().after(record.getStartTime())) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"当前时间小于最近一次抄表周期时间,请重新选择时间"); + } + r.setStartTime(DateUtils.getDayBegin(DateUtils.getTimeAfterDays(1, pre.getEndTime()))); + } }else { r.setPreNumber("0"); } - r.setStartTime(record.getStartTime()); + if (null == r.getStartTime()) { + r.setStartTime(record.getStartTime()); + } r.setEndTime(record.getEndTime()); //根据表id获取表名 WxEnergyMeter meter = wxEnergyMeterMapper.selectById(r.getMeterId(), record.getTenantId());