diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java index 13d9226..42e8bfb 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java @@ -167,12 +167,12 @@ public class ProScheduleServiceImpl implements IProScheduleService { } // 变电 - 工序进度达到 100 更新计划结束日期 if (Objects.equals(vo.getProType(), Constant.BD) && - Objects.equals(Double.parseDouble(Constant.GX_PLAN_PROGRESS), vo.getGxProgress())) { + Objects.equals(Double.parseDouble(Constant.GX_PLAN_PROGRESS), Double.parseDouble(vo.getGxProgress()))) { vo.setEndTime(DateTimeHelper.getNowDate()); } // 线路 - 工序进度为架线 并且进度到100 更新计划结束日期 if (Objects.equals(vo.getProType(), Constant.XL) && - Objects.equals(Double.parseDouble(Constant.GX_PLAN_PROGRESS), vo.getGxProgress()) && + Objects.equals(Double.parseDouble(Constant.GX_PLAN_PROGRESS), Double.parseDouble(vo.getGxProgress())) && Objects.equals(vo.getNowGxId(), Constant.JX)) { vo.setEndTime(DateTimeHelper.getNowDate()); }