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

项目库任务计划设置时间

Browse Source
This commit is contained in:
xiejunyu
2022-04-21 18:59:48 +08:00
parent 5cb4f0b5ed
commit aef19b32b3
4 changed files with 67 additions and 36 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/controller/ProjectLibraryBaseController.java
+2 -1
View File
@@ -16,6 +16,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -70,7 +71,7 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
@AutoLog(value = "项目库基础表-添加") @AutoLog(value = "项目库基础表-添加")
@ApiOperation(value="项目库基础表-添加", notes="项目库基础表-添加") @ApiOperation(value="项目库基础表-添加", notes="项目库基础表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) { public Result<?> add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException {
projectLibraryBaseService.add(projectLibraryBase); projectLibraryBaseService.add(projectLibraryBase);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
+2 -1
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectLibraryBase;
import java.text.ParseException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -21,7 +22,7 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
* @param projectLibraryBase * @param projectLibraryBase
* @return * @return
*/ */
void add(ProjectLibraryBase projectLibraryBase); void add(ProjectLibraryBase projectLibraryBase) throws ParseException;
/** /**
* 更新 * 更新
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+5 -2
View File
@@ -18,6 +18,7 @@ import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -40,6 +41,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
@Autowired @Autowired
private ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService; private ProjectRelatedPersonnelServiceImpl projectRelatedPersonnelService;
@Autowired
private ProjectTaskPlanningServiceImpl projectTaskPlanningService;
/** /**
* 保存 * 保存
@@ -48,7 +51,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
* @return * @return
*/ */
@Override @Override
public void add(ProjectLibraryBase projectLibraryBase) { public void add(ProjectLibraryBase projectLibraryBase) throws ParseException {
Date now = new Date(); Date now = new Date();
projectLibraryBase.setCreateTime(now); projectLibraryBase.setCreateTime(now);
@@ -66,7 +69,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
projectRelatedPersonnelService.setDutyTerritoryValue(sysDictItemValue,projectLibraryBase.getId()); projectRelatedPersonnelService.setDutyTerritoryValue(sysDictItemValue,projectLibraryBase.getId());
} }
} }
projectTaskPlanningService.setProjectTaskPlanning(projectLibraryBase.getId());
} }
/** /**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+58 -32
View File
@@ -7,10 +7,13 @@ import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum;
import com.jero.modules.project.mapper.ProjectTaskPlanningMapper; import com.jero.modules.project.mapper.ProjectTaskPlanningMapper;
import com.jero.modules.project.service.IProjectTaskPlanningService; import com.jero.modules.project.service.IProjectTaskPlanningService;
import com.jero.modules.project.vo.TimeNodeVO; import com.jero.modules.project.vo.TimeNodeVO;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
@@ -92,40 +95,49 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
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 = new TimeNodeVO();
listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName());
listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation());
timeNodeVOS.add(listConfirmationVO);
TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO(); if(StringUtils.isNotBlank(projectTaskPlanning.getListConfirmation().toString())) {
legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName()); listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName());
legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation()); listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation());
timeNodeVOS.add(legalTaskConfirmationVO); timeNodeVOS.add(listConfirmationVO);
}
TimeNodeVO designDeadlineVO = new TimeNodeVO();
designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName());
designDeadlineVO.setTime(projectTaskPlanning.getDesignDeadline());
timeNodeVOS.add(designDeadlineVO);
TimeNodeVO prehomoDeadlineVO = new TimeNodeVO();
prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName());
prehomoDeadlineVO.setTime(projectTaskPlanning.getPrehomoDeadline());
timeNodeVOS.add(prehomoDeadlineVO);
TimeNodeVO attestationStartTimeVO = new TimeNodeVO();
attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName());
attestationStartTimeVO.setTime(projectTaskPlanning.getAttestationStartTime());
timeNodeVOS.add(attestationStartTimeVO);
TimeNodeVO attestationEndTimeVO = new TimeNodeVO();
attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName());
attestationEndTimeVO.setTime(projectTaskPlanning.getAttestationEndTime());
timeNodeVOS.add(attestationEndTimeVO);
TimeNodeVO verifyDeadlineVO = new TimeNodeVO();
verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName());
verifyDeadlineVO.setTime(projectTaskPlanning.getVerifyDeadline());
timeNodeVOS.add(verifyDeadlineVO);
if(!StringUtils.isEmpty(projectTaskPlanning.getLegalTaskConfirmation().toString())) {
TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO();
legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName());
legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation());
timeNodeVOS.add(legalTaskConfirmationVO);
}
if(StringUtils.isNotBlank(projectTaskPlanning.getDesignDeadline().toString())) {
TimeNodeVO designDeadlineVO = new TimeNodeVO();
designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName());
designDeadlineVO.setTime(projectTaskPlanning.getDesignDeadline());
timeNodeVOS.add(designDeadlineVO);
}
if(StringUtils.isNotBlank(projectTaskPlanning.getPrehomoDeadline().toString())) {
TimeNodeVO prehomoDeadlineVO = new TimeNodeVO();
prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName());
prehomoDeadlineVO.setTime(projectTaskPlanning.getPrehomoDeadline());
timeNodeVOS.add(prehomoDeadlineVO);
}
if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationStartTime().toString())) {
TimeNodeVO attestationStartTimeVO = new TimeNodeVO();
attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName());
attestationStartTimeVO.setTime(projectTaskPlanning.getAttestationStartTime());
timeNodeVOS.add(attestationStartTimeVO);
}
if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationEndTime().toString())) {
TimeNodeVO attestationEndTimeVO = new TimeNodeVO();
attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName());
attestationEndTimeVO.setTime(projectTaskPlanning.getAttestationEndTime());
timeNodeVOS.add(attestationEndTimeVO);
}
if(StringUtils.isNotBlank(projectTaskPlanning.getVerifyDeadline().toString())) {
TimeNodeVO verifyDeadlineVO = new TimeNodeVO();
verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName());
verifyDeadlineVO.setTime(projectTaskPlanning.getVerifyDeadline());
timeNodeVOS.add(verifyDeadlineVO);
}
// 排序 // 排序
Collections.sort(timeNodeVOS, listConfirmationVO); Collections.sort(timeNodeVOS, listConfirmationVO);
@@ -142,4 +154,18 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId); ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId);
return projectTaskPlanning; return projectTaskPlanning;
} }
public void setProjectTaskPlanning(String projectId) throws ParseException {
ProjectTaskPlanning projectTaskPlanning=new ProjectTaskPlanning();
projectTaskPlanning.setProjectId(projectId);
java.text.SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd");
projectTaskPlanning.setListConfirmation(formatter.parse("0000-00-00 "));
projectTaskPlanning.setLegalTaskConfirmation(formatter.parse("0000-00-00 "));
projectTaskPlanning.setDesignDeadline(formatter.parse("0000-00-00 "));
projectTaskPlanning.setPrehomoDeadline(formatter.parse("0000-00-00 "));
projectTaskPlanning.setAttestationStartTime(formatter.parse("0000-00-00 "));
projectTaskPlanning.setAttestationEndTime(formatter.parse("0000-00-00 "));
projectTaskPlanning.setVerifyDeadline(formatter.parse("0000-00-00 "));
add(projectTaskPlanning);
}
} }