From 4682033335443e0fab67ad8fd4513858487e58e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 22 Aug 2023 11:28:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AA=E6=9C=89=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E4=BA=86vdr=E7=9A=84=E9=A1=B9=E7=9B=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AE=A1=E5=88=92=E4=BC=9A=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectTaskPlanningServiceImpl.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
index d2dfca5ae..e62ccabed 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
@@ -4,12 +4,15 @@ package com.jero.modules.project.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.ota.entity.OtaManageApplyEO;
+import com.jero.modules.ota.service.IOtaManageApplyEOService;
 import com.jero.modules.project.entity.ProjectTaskPlanning;
 import com.jero.modules.project.enums.PlanStatusEnum;
 import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum;
 import com.jero.modules.project.mapper.ProjectTaskPlanningMapper;
 import com.jero.modules.project.service.IProjectTaskPlanningService;
 import com.jero.modules.project.vo.TimeNodeVO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -31,6 +34,8 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 
 	@Autowired
 	private ProjectTaskPlanningMapper projectTaskPlanningMapper;
+	@Autowired
+	private IOtaManageApplyEOService otaManageApplyEOService;
 	/**
 	 * 保存
 	 *
@@ -64,7 +69,10 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 					|| compareDate(oldPlanning.getAttestationEndTime(), projectTaskPlanning.getAttestationEndTime())
 			) {
 				//studio修改认证计划中认证开始、认证申报、认证批准时间是进行弹窗提示
-				matchVdr = true;
+				List<OtaManageApplyEO> vdrList = otaManageApplyEOService.getVdrListByProject(projectTaskPlanning.getProjectId(),"");
+				if(CollectionUtils.isNotEmpty(vdrList)){
+					matchVdr = true;
+				}
 			}
 			deleteById(projectTaskPlanning.getId());
 			add(projectTaskPlanning);
@@ -78,7 +86,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 				return true;
 			}
 		} else {
-			if (newDate == null || (newDate != null && oldDate.equals(newDate))) {
+			if (newDate == null || (newDate != null && !oldDate.equals(newDate))) {
 				return true;
 			}
 		}