1219暴露子项目判断接口

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 查询条件

huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java

@@ -28,4 +28,12 @@ public interface HuzhouPlaninfoMapper extends BaseMapper<HuzhouPlaninfo> {
     @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<String> 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);
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java

@@ -217,5 +217,7 @@ public interface IHuzhouProjectinfoService extends IService<HuzhouProjectinfo> {
     MoneyDetailOV queryMoneyDetail(String projectid);
 
     List<ProjectContactShouYeOV> projectContactShouYe();
+
+    Boolean queryIsSubProject(String projectid);
 }
 

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<HuzhouProjectinfoM
         }
         return projectContactShouYeOVS;
     }
+
+    @Override
+    public Boolean queryIsSubProject(String projectId) {
+        LambdaQueryWrapper<HuzhouSubProjectinfo> userProjectWrapper = new LambdaQueryWrapper<>();
+        userProjectWrapper.eq(HuzhouSubProjectinfo::getProjectId, projectId)
+                .select(HuzhouSubProjectinfo::getId);
+        List<HuzhouSubProjectinfo> subProjectInfos = subProjectinfoService.list(userProjectWrapper);
+        return  CollectionUtils.isEmpty(subProjectInfos);
+    }
 }

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<HuzhouSubProjec
     @Lazy
     private IHuzhouPlaninfoService planinfoService;
 
+    @Autowired
+    private HuzhouPlaninfoMapper planinfoMapper;
+
     @Autowired
     private IHuzhouProcessinfoService processinfoService;
 
@@ -48,10 +52,12 @@ public class HuzhouSubProjectinfoServiceImpl extends ServiceImpl<HuzhouSubProjec
     public void addSubProjectinfo(HuzhouSubProjectinfo subprojectinfo) {
 
         String mainProjectId = subprojectinfo.getId();
+        String flag = planinfoMapper.getIsFinishWithTaskLevel(mainProjectId);
+        log.info("flag:{}",flag);
         ArrayList<HuzhouPlaninfoOV> 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<HuzhouSubProjec
             planinfoService.saveBatch(updatedHuzhouPlaninfoList);
 
         }else {
-            throw new EasyException("主项目立项阶段未完成,新增子项目失败");
+            throw new EasyException("主项目[立项阶段未完成] 或 [处于招标文件编制阶段} 新增子项目失败!");
         }
     }