WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改只有维护了vdr的项目修改计划会弹框

Browse Source
This commit is contained in:
高嵩
2023-08-22 11:28:22 +08:00
parent 3fc85aa605
commit 4682033335
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+10 -2
View File
@@ -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;
}
}