From 3a778366daf5c2421aac2249106f0f02dde91ce0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 27 Nov 2023 11:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AE=B5=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/busi/jx/JxMergeTimeSlotsService.java | 4 ++-- .../estsh/i3plus/ext/mes/pojo/model/jx/JxMergeTimeSlotsModel.java | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxMergeTimeSlotsService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxMergeTimeSlotsService.java index a4c69d7..9a56fd1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxMergeTimeSlotsService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxMergeTimeSlotsService.java @@ -41,8 +41,8 @@ public class JxMergeTimeSlotsService implements IJxMergeTimeSlotsService { if (timeSlot1.getEndDate().before(timeSlot2.getStartDate()) || timeSlot1.getStartDate().after(timeSlot2.getEndDate())) return null; else if (!timeSlot1.getStartDate().after(timeSlot2.getStartDate()) && !timeSlot1.getEndDate().before(timeSlot2.getEndDate())) return timeSlot1; else if (!timeSlot2.getStartDate().after(timeSlot1.getStartDate()) && !timeSlot2.getEndDate().before(timeSlot1.getEndDate())) return timeSlot2; - else if (timeSlot1.getStartDate().before(timeSlot2.getStartDate()) && timeSlot1.getEndDate().before(timeSlot2.getEndDate())) return new JxMergeTimeSlotsModel().copy(timeSlot1).mergeEnd(timeSlot2.getEndTime(), timeSlot2.getEndDate()); - else if (timeSlot2.getStartDate().before(timeSlot1.getStartDate()) && timeSlot2.getEndDate().before(timeSlot1.getEndDate())) return new JxMergeTimeSlotsModel().copy(timeSlot2).mergeEnd(timeSlot1.getEndTime(), timeSlot1.getEndDate()); + else if (timeSlot1.getStartDate().before(timeSlot2.getStartDate()) && timeSlot1.getEndDate().before(timeSlot2.getEndDate())) return timeSlot1.mergeEnd(timeSlot2.getEndTime(), timeSlot2.getEndDate()); + else if (timeSlot2.getStartDate().before(timeSlot1.getStartDate()) && timeSlot2.getEndDate().before(timeSlot1.getEndDate())) return timeSlot2.mergeEnd(timeSlot1.getEndTime(), timeSlot1.getEndDate()); else return null; } diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/jx/JxMergeTimeSlotsModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/jx/JxMergeTimeSlotsModel.java index a8600eb..4a69e0d 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/jx/JxMergeTimeSlotsModel.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/jx/JxMergeTimeSlotsModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.ext.mes.pojo.model.jx; import io.swagger.annotations.ApiModel; import lombok.Data; -import org.springframework.beans.BeanUtils; import java.io.Serializable; import java.text.ParseException; @@ -37,11 +36,6 @@ public class JxMergeTimeSlotsModel implements Serializable { return this; } - public JxMergeTimeSlotsModel copy(JxMergeTimeSlotsModel timeSlot) { - BeanUtils.copyProperties(timeSlot, this); - return this; - } - public JxMergeTimeSlotsModel mergeEnd(String endTime, Date endDate) { this.endTime = endTime; this.endDate = endDate;