diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java index 1e5b0c8..4902e48 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java @@ -239,4 +239,15 @@ public class HuzhouPlanController { List rs =planinfoService.getPlanNames(projectid); return Result.OK(rs); } + + /** + * 自测接口 + * @param projectId + * @return + */ + @GetMapping("/isCanUploadFile") + public Result isCanUploadFile(@Param("projectId") String projectId,@Param("taskName")String taskName) { + Boolean rs = planinfoService.isCanUploadFile(projectId, taskName); + return Result.OK("指定任务是否完成:",rs); + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java index 9733217..073edab 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java @@ -138,4 +138,6 @@ public interface IHuzhouPlaninfoService extends IService { void updateScheduledTime(HuzhouPlaninfo huzhouPlaninfo); List getPlanNames(String projectid); + + Boolean isCanUploadFile(String projectId,String taskName); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java index 67cf9e2..494b4ed 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java @@ -1707,12 +1707,13 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(HuzhouPlaninfo::getProjectId,projectid) .last("LIMIT 1"); + // 不知道groupId 有什么用暂时 HuzhouPlaninfo oldPlanInfo = planInfoMapper.selectOne(queryWrapper); String groupId = oldPlanInfo.getGroupId(); // 1. 删除原先的计划 @@ -1751,18 +1752,12 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl updateWrapper2 = new LambdaUpdateWrapper<>(); -// updateWrapper2.eq(HuzhouPlaninfo::getProjectId, projectid) -// .likeRight(HuzhouPlaninfo::getTaskLevel, "1") -// .set(HuzhouPlaninfo::getIsfinish, "2"); -// planInfoMapper.update(null, updateWrapper2); - - // TODO 5. 更新子项目计划更新标志 -// LambdaUpdateWrapper subUpdateWrapper = new LambdaUpdateWrapper<>(); -// subUpdateWrapper.eq(HuzhouSubProjectinfo::getId, projectid); -// subUpdateWrapper.set(HuzhouSubProjectinfo::getUpdatePlanFlag, "2"); -// subProjectInfoMapper.update(null, subUpdateWrapper); + + // 5. 增加限制:监理项目只允许修改一次 + LambdaUpdateWrapper subUpdateWrapper = new LambdaUpdateWrapper<>(); + subUpdateWrapper.eq(HuzhouSubProjectinfo::getId, projectid); + subUpdateWrapper.set(HuzhouSubProjectinfo::getUpdatePlanFlag, "2"); + subProjectInfoMapper.update(null, subUpdateWrapper); } @Override @@ -1786,4 +1781,14 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouPlaninfo::getProjectId, projectId) + .eq(HuzhouPlaninfo::getTaskName, taskName) + .eq(HuzhouPlaninfo::getIsfinish, "2"); + + return planInfoMapper.selectCount(queryWrapper) > 0; + } }