修改项目计划跳转VDR

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java

@@ -23,7 +23,9 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -103,8 +105,10 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
 	@ApiOperation(value="法规,认证任务计划 (各阶段确认进度) 表-编辑", notes="法规,认证任务计划 (各阶段确认进度) 表-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@Validated @RequestBody ProjectTaskPlanning projectTaskPlanning) {
-		projectTaskPlanningService.editById(projectTaskPlanning);
+		boolean matchVdr = projectTaskPlanningService.editById(projectTaskPlanning);
-		return Result.OK("编辑成功!");
+		Map<String,Object> res = new HashMap<>();
+		res.put("matchVdr",matchVdr);
+		return Result.OK("编辑成功!",res);
 	}
 
 	/**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java

@@ -28,7 +28,7 @@ public interface IProjectTaskPlanningService extends IService<ProjectTaskPlannin
 	 * @param projectTaskPlanning
 	 * @return
 	 */
-    void editById(ProjectTaskPlanning projectTaskPlanning);
+	boolean editById(ProjectTaskPlanning projectTaskPlanning);
 
 	/**
 	 * 通过id删除

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java

@@ -52,14 +52,37 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 	 * 更新
 	 *
 	 * @param projectTaskPlanning
-	 * @return
+	 * @return 是否需要跳转VDR
 	 */
 	@Override
-	public void editById(ProjectTaskPlanning projectTaskPlanning) {
+	public boolean editById(ProjectTaskPlanning projectTaskPlanning) {
+		boolean matchVdr = false;
 		if (null != projectTaskPlanning && StringUtils.isNotEmpty(projectTaskPlanning.getId())) {
+			ProjectTaskPlanning oldPlanning = this.getById(projectTaskPlanning.getId());
+			if (compareDate(oldPlanning.getAttestationStartTime(), projectTaskPlanning.getAttestationStartTime())
+					|| compareDate(oldPlanning.getCertificationSubmission(), projectTaskPlanning.getCertificationSubmission())
+					|| compareDate(oldPlanning.getAttestationEndTime(), projectTaskPlanning.getAttestationEndTime())
+			) {
+				//studio修改认证计划中认证开始、认证申报、认证批准时间是进行弹窗提示
+				matchVdr = true;
+			}
 			deleteById(projectTaskPlanning.getId());
 			add(projectTaskPlanning);
 		}
+		return matchVdr;
+	}
+
+	private boolean compareDate(Date oldDate, Date newDate) {
+		if (oldDate == null) {
+			if (newDate != null) {
+				return true;
+			}
+		} else {
+			if (newDate == null || (newDate != null && oldDate.equals(newDate))) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	/**