From a05ea11a6055bb7127e085ab83dc35900184597a Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 6 May 2024 13:20:40 +0800
Subject: [PATCH] =?UTF-8?q?2024-5-6=20=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?-=E7=82=B9=E6=A3=80=E5=B7=A1=E6=A3=80=E4=BF=9D=E5=85=BB?=
=?UTF-8?q?=E5=88=A4=E7=A9=BA=E9=97=AE=E9=A2=982?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../device/service/impl/EquPlanServiceImpl.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
index fc366b7b..a060de6e 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java
@@ -145,9 +145,11 @@ public class EquPlanServiceImpl implements IEquPlanService {
equPlan.setPlanId(IdUtils.fastSimpleUUID());// 计划id
equPlan.setPlanCode((DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + planSerialNum));// 计划编码
- if (equPlan.getPlanTimeArray().size() > 0) {
- equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 计划循环周期开始时间
- equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 计划循环周期结束时间
+ if (equPlan.getPlanTimeArray() != null){
+ if (equPlan.getPlanTimeArray().size() > 0) {
+ equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 计划循环周期开始时间
+ equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 计划循环周期结束时间
+ }
}
equPlan.setFactoryCode(factory);// 工厂编码
equPlan.setCreateBy(SecurityContextHolder.getUserName());
@@ -174,9 +176,11 @@ public class EquPlanServiceImpl implements IEquPlanService {
@DS("#header.poolName")
public AjaxResult updateEquPlan(EquPlan equPlan) {
// 设置循环范围时间
- if (equPlan.getPlanTimeArray().size() > 0) {
- equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 循环开始时间
- equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 循环结束时间
+ if (equPlan.getPlanTimeArray() != null){
+ if (equPlan.getPlanTimeArray().size() > 0) {
+ equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 计划循环周期开始时间
+ equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 计划循环周期结束时间
+ }
}
// 更新计划
equPlanMapper.updateEquPlan(equPlan);