Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
4adf5ba7ff
1 changed files with 9 additions and 1 deletions
  1. +9
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java

+ 9
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java View File

@@ -845,10 +845,18 @@ public class WxEnergyServiceImpl implements WxEnergyService {
r.setPreTime(pre.getCreateTime()); r.setPreTime(pre.getCreateTime());
r.setPreBy(pre.getCreateBy()); r.setPreBy(pre.getCreateBy());
r.setPreByName(pre.getCreateByName()); 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 { }else {
r.setPreNumber("0"); r.setPreNumber("0");
} }
r.setStartTime(record.getStartTime());
if (null == r.getStartTime()) {
r.setStartTime(record.getStartTime());
}
r.setEndTime(record.getEndTime()); r.setEndTime(record.getEndTime());
//根据表id获取表名 //根据表id获取表名
WxEnergyMeter meter = wxEnergyMeterMapper.selectById(r.getMeterId(), record.getTenantId()); WxEnergyMeter meter = wxEnergyMeterMapper.selectById(r.getMeterId(), record.getTenantId());


Loading…
Cancel
Save