From 8fec9579ae4adb4f7f53440933908c90eea33b20 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 19 二月 2025 15:35:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/resources/mapper/ProjectInfoMapper.xml | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml index 3fe901c..c8c8bf3 100644 --- a/business/src/main/resources/mapper/ProjectInfoMapper.xml +++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml @@ -16,6 +16,7 @@ TPI.project_name, TPI.project_code, TPI.content, + TPI.construction_nature, TPI.project_type, TPI.project_status, TPI.fund_type, @@ -46,7 +47,10 @@ TPI.update_by, TPI.create_by, TPI.remark, - TPI.id + TPI.id, + TPI.industry_competent_department, + TPI.industry_competent_department_person, + TPI.department_person_phone FROM t_project_info TPI WHERE @@ -190,7 +194,7 @@ <select id="selectProjectDetailByIds" resultType="com.ycl.domain.vo.ProjectVO"> select - TPI.id as id,TPI.project_name,TPI.project_code,TPI.content,TPI.project_type,TPI.project_status,TPI.fund_type,TPI.invest_type,TPI.project_phase, + TPI.id as id,TPI.project_name,TPI.project_code,TPI.content,TPI.construction_nature,TPI.project_type,TPI.project_status,TPI.fund_type,TPI.invest_type,TPI.project_phase, TPI.tag,TPI.competent_department,TPI.area,TPI.management_centralization,TPI.project_approval_type,TPI.importance_type,TPI.year,TPI.year_invest_amount,TPI.create_project_time,TPI.plan_start_time, TPI.plan_complete_time,TPI.win_unit,TPI.win_amount,TPI.win_time,TPI.project_address,TPI.longitude,TPI.latitude, TPI.project_owner_unit,TPI.project_contact_person,TPI.contact,TPI.gmt_create,TPI.gmt_update,TPI.update_by,TPI.create_by, -- Gitblit v1.8.0