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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index 3b9cdd2..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
@@ -96,7 +100,7 @@
TPURI.contact_address as TPURI_contact_address,
TPURI.post_code as TPURI_post_code,
TPURI.email as TPURI_email,
- TPI.coding
+ d.dept_name as project_owner_unit_name
FROM
t_project_info TPI
LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0
@@ -104,7 +108,7 @@
LEFT JOIN t_project_investment_policy_compliance TPIPC ON TPI.id = TPIPC.project_id and TPIPC.deleted = 0
LEFT JOIN t_project_unit_registration_info TPURI ON TPI.id = TPURI.project_id and TPURI.deleted = 0
LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
--- LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit
+ LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit
<where>
TPI.deleted = 0
<if test="query.projectName !=null and query.projectName!=''">
@@ -167,8 +171,7 @@
<!-- and TPI.used_status != 2-->
<!-- </if>-->
<if test="query.role == 1">
- and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0;
-
+ and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
</if>
</if>
<!--${query.params.dataScope}-->
@@ -191,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