diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java index 55620e7..90a817d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java @@ -138,6 +138,17 @@ public class HuzhouProjectController { return Result.OK(flag); } + /** + * 判断是否有子项目 + * @param projectid + * @return + */ + @GetMapping("/queryHasSubProject") + public Result queryHasSubProject(String projectid){ + Boolean flag = projectinfoService.queryHasSubProject(projectid); + return Result.OK(flag); + } + /** * 项目计划列表信息 * @param projectinfo 查询条件 diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java index b440ebc..f4ccd43 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java @@ -220,5 +220,6 @@ public interface IHuzhouProjectinfoService extends IService { Boolean queryIsSubProject(String projectid); + Boolean queryHasSubProject(String projectid); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index f48a0c5..e5cfba4 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -2489,10 +2489,36 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl userProjectWrapper = new LambdaQueryWrapper<>(); + userProjectWrapper.eq(HuzhouSubProjectinfo::getProjectId, projectid); + + List subProjectInfos = subProjectinfoService.list(userProjectWrapper); + + if (CollectionUtils.isNotEmpty(subProjectInfos)) { + List subProjectIds = subProjectInfos + .stream().map(HuzhouSubProjectinfo::getId) + .collect(Collectors.toList()); + + if (subProjectIds.size() > 0) { + log.info("该主项目id为:{} 子项目数量为:{} 子项目id集合为:{}", projectid, subProjectIds.size(), subProjectIds); + return true; + } + } + log.info("该项目不存在子项目!"); return false; }