From 450dcf27c8109e1cd1107a5a18aa710e0e9cadf0 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Sat, 14 Sep 2024 11:15:34 +0800 Subject: [PATCH] 1 --- .../supervise/crm/biz/projectphase/ProjectPhaseMapper.java | 2 +- .../supervise/crm/biz/projectphase/ProjectPhaseMapper.xml | 4 ++-- .../crm/biz/projectphase/ProjectPhaseService.java | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.java index 4443cb1b..ce4db013 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.java @@ -18,6 +18,6 @@ import java.util.List; @Mapper public interface ProjectPhaseMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List getNodeByProjectSid(@Param("projectSid") String projectSid); + List getNodeByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid); } \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.xml index 31de3e75..e61a7958 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.xml @@ -10,7 +10,7 @@ ${ew.sqlSegment} - + select * from project_phase_dictionary where enterpriseSid=#{enterpriseSid} \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseService.java index 6704b5fa..55685088 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseService.java @@ -8,10 +8,12 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo; import com.yxt.supervise.crm.api.projectphase.ProjectPhase; import com.yxt.supervise.crm.api.projectphase.ProjectPhaseDto; import com.yxt.supervise.crm.api.projectphase.ProjectPhaseQuery; import com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo; +import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,6 +27,8 @@ import java.util.List; public class ProjectPhaseService extends MybatisBaseService { @Autowired com.yxt.supervise.crm.feign.system.SysUserFeign sysUserFeign; + @Autowired + EnterpriseProjectService enterpriseProjectService; public PagerVo listPageVo(PagerQuery pq) { ProjectPhaseQuery query = pq.getParams(); @@ -78,7 +82,8 @@ public class ProjectPhaseService extends MybatisBaseService> getNodeByProjectSid(String projectSid) { ResultBean rb =new ResultBean().fail(); - List projectPhaseVoList=baseMapper.getNodeByProjectSid(projectSid); + List list=enterpriseProjectService.getEnterpriseByProjectSid(projectSid); + List projectPhaseVoList=baseMapper.getNodeByEnterpriseSid(list.get(0).getEnterpriseSid()); return rb.success().setData(projectPhaseVoList); } } \ No newline at end of file