From 8a74ea05b6c244c73f2e2ad1a63e252d6b4fd018 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 1 Sep 2024 17:01:24 +0800 Subject: [PATCH] fix --- .../java/com/iformall/service/impl/WxEnergyServiceImpl.java | 3 ++- 1 file changed, 2 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 025a4c6e1..31d96bf96 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -846,7 +846,8 @@ public class WxEnergyServiceImpl implements WxEnergyService { r.setPreBy(pre.getCreateBy()); r.setPreByName(pre.getCreateByName()); if (null != pre.getEndTime()) { - if (pre.getEndTime().after(record.getStartTime())) { + //有可能撤铺的时候中间抄了一次,这一次抄表又是统一时间抄表,所以比较结束时间 + if (pre.getEndTime().after(record.getEndTime())) { throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"当前时间小于最近一次抄表周期时间,请重新选择时间"); } r.setStartTime(DateUtils.getDayBegin(DateUtils.getTimeAfterDays(1, pre.getEndTime())));