1230：暴露“合同签订”阶段是否完成接口

huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java

@@ -149,6 +149,17 @@ public class HuzhouProjectController {
         return Result.OK(flag);
     }
 
+    /**
+     * 判断项目 "合同签订阶段" 是否完成
+     * @param projectid
+     * @return
+     */
+    @GetMapping("/queryContractSignIsFinish")
+    public Result<?> queryContractSignIsFinish(String projectid){
+        Boolean flag =  projectinfoService.queryContractSignIsFinish(projectid);
+        return Result.OK(flag);
+    }
+
     /**
      * 项目计划列表信息
      * @param projectinfo 查询条件

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

@@ -221,5 +221,7 @@ public interface IHuzhouProjectinfoService extends IService<HuzhouProjectinfo> {
     Boolean queryIsSubProject(String projectid);
 
     Boolean queryHasSubProject(String projectid);
+
+    Boolean queryContractSignIsFinish(String projectid);
 }
 

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.easy.admin.auth.model.SysRole;
 import com.easy.admin.auth.model.SysUser;
 import com.easy.admin.auth.service.SysUserService;
+import com.easy.admin.common.constant.CommonConstant;
 import com.easy.admin.common.core.common.select.Select;
 import com.easy.admin.common.core.exception.EasyException;
 import com.easy.admin.common.util.CommonUtils;
@@ -1320,6 +1321,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         int cityNum = 0;
         int countryNum = 0;
         HuzhouProjectinfo projectInfo = new HuzhouProjectinfo();
+        projectInfo.setStage("0.1");
         ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
         List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect);
         if(projectinfoOVList.size()>0){
@@ -2392,11 +2394,11 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         int cityNum=0;
         int countryNum=0;
         HuzhouProjectinfo projectInfo = new HuzhouProjectinfo();
-        projectInfo.setStage("-1");
+        projectInfo.setStage("0.1");
         ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
         List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect);
         if(projectinfoOVList.size()>0){
-            total=projectinfoOVList.stream().filter(x->x.getStage().equals("-1")).collect(Collectors.toList()).size();
+            total=projectinfoOVList.stream().filter(x->x.getStage().equals("0.1")).collect(Collectors.toList()).size();
         }
         CountNumberOV result=new CountNumberOV();
         result.setTotal(total);
@@ -2522,5 +2524,27 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         return false;
     }
 
+    /**
+     * 判断该项目的 “合同签订”阶段是否完成
+     * @param projectid
+     * @return
+     */
+    @Override
+    public Boolean queryContractSignIsFinish(String projectid) {
+        String taskName = "合同签订";
+        LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(HuzhouPlaninfo::getProjectId, projectid)
+                .eq(HuzhouPlaninfo::getTaskName,taskName);
+
+        HuzhouPlaninfo huzhouPlaninfo = planinfoService.list(queryWrapper).get(0);
+        String flag = huzhouPlaninfo.getIsfinish();
+        if (CommonConstant.PRO_PLAN_FINISHED.equals(flag)){
+            log.info("合同签订阶段已完成--project_id：{}", projectid);
+            return true;
+        }
+        log.info("合同签订阶段未完成--project_id：{} ", projectid);
+        return false;
+    }
+
 
 }