项目库任务计划时间轴修改
This commit is contained in:
+6
-4
@@ -92,11 +92,12 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
|
|||||||
public List<TimeNodeVO> queryByProjectId(String projectId) {
|
public List<TimeNodeVO> queryByProjectId(String projectId) {
|
||||||
ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId);
|
ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId);
|
||||||
List<TimeNodeVO> timeNodeVOS = new ArrayList<>();
|
List<TimeNodeVO> timeNodeVOS = new ArrayList<>();
|
||||||
TimeNodeVO listConfirmationVO = new TimeNodeVO();
|
TimeNodeVO listConfirmationVO=null;
|
||||||
|
|
||||||
Date now=new Date();
|
Date now=new Date();
|
||||||
Calendar cal1 = Calendar.getInstance();
|
Calendar cal1 = Calendar.getInstance();
|
||||||
cal1.setTime(now);
|
cal1.setTime(now);
|
||||||
// 将时分秒,毫秒域清零
|
// 将时分秒,毫秒域清零
|
||||||
cal1.set(Calendar.HOUR_OF_DAY, 0);
|
cal1.set(Calendar.HOUR_OF_DAY, 0);
|
||||||
cal1.set(Calendar.MINUTE, 0);
|
cal1.set(Calendar.MINUTE, 0);
|
||||||
cal1.set(Calendar.SECOND, 0);
|
cal1.set(Calendar.SECOND, 0);
|
||||||
@@ -104,12 +105,13 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
|
|||||||
Date trueNow = cal1.getTime();
|
Date trueNow = cal1.getTime();
|
||||||
|
|
||||||
if(StringUtils.isNotBlank(projectTaskPlanning.getListConfirmation().toString())) {
|
if(StringUtils.isNotBlank(projectTaskPlanning.getListConfirmation().toString())) {
|
||||||
|
listConfirmationVO = new TimeNodeVO();
|
||||||
listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName());
|
listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName());
|
||||||
listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation());
|
listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation());
|
||||||
if(projectTaskPlanning.getListConfirmation().after(trueNow)){
|
if(projectTaskPlanning.getListConfirmation().after(trueNow)){
|
||||||
listConfirmationVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
|
|
||||||
}else if(projectTaskPlanning.getListConfirmation().before(trueNow)){
|
|
||||||
listConfirmationVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
|
listConfirmationVO.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
|
||||||
|
}else if(projectTaskPlanning.getListConfirmation().before(trueNow)){
|
||||||
|
listConfirmationVO.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
|
||||||
}else{
|
}else{
|
||||||
listConfirmationVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
|
listConfirmationVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user