项目库法规认证计划(各阶段确认进度)修改
This commit is contained in:
+1
-1
@@ -14,6 +14,6 @@ import java.util.List;
|
||||
*/
|
||||
public interface ProjectTaskPlanningMapper extends BaseMapper<ProjectTaskPlanning> {
|
||||
@Select("SELECT * FROM project_task_planning where project_id=#{projectId}")
|
||||
List<ProjectTaskPlanning> getByProjectId(String projectId);
|
||||
ProjectTaskPlanning getByProjectId(String projectId);
|
||||
|
||||
}
|
||||
|
||||
+41
-44
@@ -31,10 +31,10 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void add(ProjectTaskPlanning projectTaskPlanning) {
|
||||
public void add(ProjectTaskPlanning projectTaskPlanning) {
|
||||
|
||||
save(projectTaskPlanning);
|
||||
}
|
||||
save(projectTaskPlanning);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新
|
||||
@@ -43,10 +43,10 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void editById(ProjectTaskPlanning projectTaskPlanning) {
|
||||
public void editById(ProjectTaskPlanning projectTaskPlanning) {
|
||||
|
||||
saveOrUpdate(projectTaskPlanning);
|
||||
}
|
||||
saveOrUpdate(projectTaskPlanning);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
@@ -78,59 +78,56 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
|
||||
*/
|
||||
@Override
|
||||
public List<TimeNodeVO> queryByProjectId(String projectId) {
|
||||
List<ProjectTaskPlanning> projectTaskPlanningList = projectTaskPlanningMapper.getByProjectId(projectId);
|
||||
|
||||
ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId);
|
||||
List<TimeNodeVO> timeNodeVOS = new ArrayList<>();
|
||||
for (ProjectTaskPlanning projectTaskPlanning : projectTaskPlanningList) {
|
||||
TimeNodeVO listConfirmationVO = new TimeNodeVO();
|
||||
listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName());
|
||||
listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation());
|
||||
timeNodeVOS.add(listConfirmationVO);
|
||||
|
||||
TimeNodeVO listConfirmationVO = new TimeNodeVO();
|
||||
listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName());
|
||||
listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation());
|
||||
timeNodeVOS.add(listConfirmationVO);
|
||||
TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO();
|
||||
legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName());
|
||||
legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation());
|
||||
timeNodeVOS.add(legalTaskConfirmationVO);
|
||||
|
||||
TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO();
|
||||
legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName());
|
||||
legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation());
|
||||
timeNodeVOS.add(legalTaskConfirmationVO);
|
||||
TimeNodeVO designDeadlineVO = new TimeNodeVO();
|
||||
designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName());
|
||||
designDeadlineVO.setTime(projectTaskPlanning.getDesignDeadline());
|
||||
timeNodeVOS.add(designDeadlineVO);
|
||||
|
||||
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 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 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 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);
|
||||
|
||||
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);
|
||||
}
|
||||
return timeNodeVOS;
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<ProjectTaskPlanning> queryList() {
|
||||
return list();
|
||||
}
|
||||
public List<ProjectTaskPlanning> queryList() {
|
||||
return list();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user