From 2e43a4367bf0f5c6d0470ee6b30ebd44ce03baa1 Mon Sep 17 00:00:00 2001 From: gejunhao <1421207006@qq.com> Date: Thu, 19 Dec 2024 15:03:56 +0800 Subject: [PATCH] =?UTF-8?q?1219=E6=9A=B4=E9=9C=B2=E5=AD=90=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=A4=E6=96=AD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../huzhou/controller/HuzhouProjectController.java | 13 +++++++++++++ .../modules/huzhou/dao/HuzhouPlaninfoMapper.java | 8 ++++++++ .../huzhou/service/IHuzhouProjectinfoService.java | 2 ++ .../service/impl/HuzhouProjectinfoServiceImpl.java | 10 ++++++++++ .../impl/HuzhouSubProjectinfoServiceImpl.java | 10 ++++++++-- 5 files changed, 41 insertions(+), 2 deletions(-) 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 1638a1d..55620e7 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 @@ -31,6 +31,8 @@ public class HuzhouProjectController { private IHuzhouProjectinfoService projectinfoService; @Autowired private IHuzhouUserprojectService userprojectService; + @Autowired + private IHuzhouSubProjectinfoService subProjectinfoService; /** @@ -125,6 +127,17 @@ public class HuzhouProjectController { } + /** + * 判断是否为子项目 + * @param projectid + * @return + */ + @GetMapping("/queryIsSubProject") + public Result queryIsSubProject(String projectid){ + Boolean flag = projectinfoService.queryIsSubProject(projectid); + return Result.OK(flag); + } + /** * 项目计划列表信息 * @param projectinfo 查询条件 diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java index aeb781c..106a1b6 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java @@ -28,4 +28,12 @@ public interface HuzhouPlaninfoMapper extends BaseMapper { @Select("SELECT DISTINCT task_level FROM huzhou_planinfo WHERE project_id = #{projectId} AND superior != '0' ORDER BY task_level ASC") //@Select("SELECT DISTINCT task_level FROM huzhou_planinfo WHERE project_id = #{projectId} ORDER BY task_level ASC") List selectDistinctLowerTaskLevels(String projectId); + + /** + * + * @param mainProjectId + * @return + */ + @Select("SELECT isfinish FROM huzhou_planinfo WHERE project_id = #{mainProjectId} AND `task_level` = '2.1' ") + String getIsFinishWithTaskLevel(String mainProjectId); } 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 f0ccfd2..ae6c557 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 @@ -217,5 +217,7 @@ public interface IHuzhouProjectinfoService extends IService { MoneyDetailOV queryMoneyDetail(String projectid); List projectContactShouYe(); + + Boolean queryIsSubProject(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 c98ddce..596b504 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.easy.admin.auth.model.SysRole; @@ -2480,4 +2481,13 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl userProjectWrapper = new LambdaQueryWrapper<>(); + userProjectWrapper.eq(HuzhouSubProjectinfo::getProjectId, projectId) + .select(HuzhouSubProjectinfo::getId); + List subProjectInfos = subProjectinfoService.list(userProjectWrapper); + return CollectionUtils.isEmpty(subProjectInfos); + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java index 07138d8..a820e8a 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouSubProjectinfoServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.easy.admin.common.constant.CommonConstant; import com.easy.admin.common.core.exception.EasyException; +import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfoMapper; import com.easy.admin.modules.huzhou.dao.HuzhouSubProjectinfoMapper; import com.easy.admin.modules.huzhou.entity.*; import com.easy.admin.modules.huzhou.service.*; @@ -40,6 +41,9 @@ public class HuzhouSubProjectinfoServiceImpl extends ServiceImpl planInfoMainTimelineList = planinfoService.getPlanInfoMainTimelineList(mainProjectId); String isFinish = planInfoMainTimelineList.get(0).getIsfinish(); // "项目立项阶段"完成才能添加子任务 - if (isFinish.equals(CommonConstant.PRO_PLAN_FINISHED)){ + if (isFinish.equals(CommonConstant.PRO_PLAN_FINISHED) && !flag.equals("1")){ // 把主项目的id 设置为子项目的projectId subprojectinfo.setProjectId(mainProjectId); subprojectinfo.setId(null); @@ -90,7 +96,7 @@ public class HuzhouSubProjectinfoServiceImpl extends ServiceImpl