From ec9a95eb994018cc1ba28a80946165f795001dea Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 29 十一月 2024 16:49:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/resources/mapper/ProjectInfoMapper.xml | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml index 0da2550..4de8e29 100644 --- a/business/src/main/resources/mapper/ProjectInfoMapper.xml +++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml @@ -149,8 +149,36 @@ <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'"> and TPP.process_instance_id is not null </if> + <if test="query.projectCategory == 3"> + and (TPI.project_status = 'working' or TPI.project_status = 'stop') + </if> </where> order by TPI.gmt_create </select> + <select id="homeCount" resultType="com.ycl.domain.vo.ProjectVO"> + SELECT TPI.*,TPIF.total_investment,TPP.process_instance_id as processId + FROM t_project_info TPI + LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0 + LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0 + WHERE TPI.deleted = 0 + </select> + + <select id="selectProjectDetailByIds" resultType="com.ycl.domain.vo.ProjectVO"> + select * + from t_project_info TPI + left join t_project_investment_funding TPIF on TPI.id = TPIF.project_id and TPIF.deleted = 0 + left join t_project_investment_info TPII on TPI.id = TPII.project_id and TPII.deleted = 0 + left join t_project_unit_registration_info TPURI on TPI.id = TPURI.project_id and TPURI.deleted = 0 + left join t_project_investment_policy_compliance TPIPC on TPI.id = TPIPC.project_id and TPIPC.deleted = 0 + <where> + TPI.deleted =0 + <if test="dataIdList != null and dataIdList.size > 0"> + and TPI.id in + <foreach collection="dataIdList" item="id" separator="," open="(" close=")"> + #{id} + </foreach> + </if> + </where> + </select> </mapper> -- Gitblit v1.8.0