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-20 16:32:18 +08:00
parent d6a47780ed
commit 7df22a72a9
2 changed files with 42 additions and 45 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/mapper/ProjectTaskPlanningMapper.java
+1 -1
View File
@@ -14,6 +14,6 @@ import java.util.List;
*/ */
public interface ProjectTaskPlanningMapper extends BaseMapper<ProjectTaskPlanning> { public interface ProjectTaskPlanningMapper extends BaseMapper<ProjectTaskPlanning> {
@Select("SELECT * FROM project_task_planning where project_id=#{projectId}") @Select("SELECT * FROM project_task_planning where project_id=#{projectId}")
List<ProjectTaskPlanning> getByProjectId(String projectId); ProjectTaskPlanning getByProjectId(String projectId);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+41 -44
View File
@@ -31,10 +31,10 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
* @return * @return
*/ */
@Override @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 * @return
*/ */
@Override @Override
public void editById(ProjectTaskPlanning projectTaskPlanning) { public void editById(ProjectTaskPlanning projectTaskPlanning) {
saveOrUpdate(projectTaskPlanning); saveOrUpdate(projectTaskPlanning);
} }
/** /**
* 通过id删除 * 通过id删除
@@ -78,59 +78,56 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
*/ */
@Override @Override
public List<TimeNodeVO> queryByProjectId(String projectId) { public List<TimeNodeVO> queryByProjectId(String projectId) {
List<ProjectTaskPlanning> projectTaskPlanningList = projectTaskPlanningMapper.getByProjectId(projectId); ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId);
List<TimeNodeVO> timeNodeVOS = new ArrayList<>(); 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(); TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO();
listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName()); legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName());
listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation()); legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation());
timeNodeVOS.add(listConfirmationVO); timeNodeVOS.add(legalTaskConfirmationVO);
TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO(); TimeNodeVO designDeadlineVO = new TimeNodeVO();
legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName()); designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName());
legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation()); designDeadlineVO.setTime(projectTaskPlanning.getDesignDeadline());
timeNodeVOS.add(legalTaskConfirmationVO); timeNodeVOS.add(designDeadlineVO);
TimeNodeVO designDeadlineVO = new TimeNodeVO(); TimeNodeVO prehomoDeadlineVO = new TimeNodeVO();
designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName()); prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName());
designDeadlineVO.setTime(projectTaskPlanning.getDesignDeadline()); prehomoDeadlineVO.setTime(projectTaskPlanning.getPrehomoDeadline());
timeNodeVOS.add(designDeadlineVO); timeNodeVOS.add(prehomoDeadlineVO);
TimeNodeVO prehomoDeadlineVO = new TimeNodeVO(); TimeNodeVO attestationStartTimeVO = new TimeNodeVO();
prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName()); attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName());
prehomoDeadlineVO.setTime(projectTaskPlanning.getPrehomoDeadline()); attestationStartTimeVO.setTime(projectTaskPlanning.getAttestationStartTime());
timeNodeVOS.add(prehomoDeadlineVO); timeNodeVOS.add(attestationStartTimeVO);
TimeNodeVO attestationStartTimeVO = new TimeNodeVO(); TimeNodeVO attestationEndTimeVO = new TimeNodeVO();
attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName()); attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName());
attestationStartTimeVO.setTime(projectTaskPlanning.getAttestationStartTime()); attestationEndTimeVO.setTime(projectTaskPlanning.getAttestationEndTime());
timeNodeVOS.add(attestationStartTimeVO); timeNodeVOS.add(attestationEndTimeVO);
TimeNodeVO attestationEndTimeVO = new TimeNodeVO(); TimeNodeVO verifyDeadlineVO = new TimeNodeVO();
attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName()); verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName());
attestationEndTimeVO.setTime(projectTaskPlanning.getAttestationEndTime()); verifyDeadlineVO.setTime(projectTaskPlanning.getVerifyDeadline());
timeNodeVOS.add(attestationEndTimeVO); timeNodeVOS.add(verifyDeadlineVO);
TimeNodeVO verifyDeadlineVO = new TimeNodeVO(); // 排序
verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName()); Collections.sort(timeNodeVOS, listConfirmationVO);
verifyDeadlineVO.setTime(projectTaskPlanning.getVerifyDeadline());
timeNodeVOS.add(verifyDeadlineVO);
// 排序
Collections.sort(timeNodeVOS, listConfirmationVO);
}
return timeNodeVOS; return timeNodeVOS;
} }
/** /**
* 列表查询 * 列表查询
* *
* @return * @return
*/ */
@Override @Override
public List<ProjectTaskPlanning> queryList() { public List<ProjectTaskPlanning> queryList() {
return list(); return list();
} }
} }