From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index 7704f4a..36801ea 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -26,6 +26,8 @@
TPI.project_phase,
TPI.tag,
TPI.competent_department,
+ TPI.competent_department_phone,
+ TPI.competent_department_person,
TPI.area,
TPI.management_centralization,
TPI.project_approval_type,
@@ -162,20 +164,18 @@
<!-- <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">-->
<!-- and TPP.process_ins_id is not null-->
<!-- </if>-->
- <if test="query.projectPhase == 3">
- and (TPI.project_status = 'working' or TPI.project_status = 'stop')
- </if>
- <if test="query.projectPhase == null">
- <if test="query.role != null and query.role == 1">
- and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
- </if>
- </if>
+<!-- <if test="query.projectPhase == 3">-->
+<!-- and (TPI.project_status = 'working' or TPI.project_status = 'stop')-->
+<!-- </if>-->
+<!-- <if test="query.role != null and query.role == 1">-->
+<!-- and TPI.competent_department = #{query.competentDepartment}-->
+<!-- </if>-->
<!-- 涓氫富鏁版嵁鏉冮檺 -->
<if test="query.role != null and query.role == 0">
${query.params.dataScope}
</if>
</where>
- order by TPI.id DESC
+ ORDER BY FIELD(TPI.used_status, 1, -1, 0, 2), TPI.gmt_create DESC
</select>
<select id="homeCount" parameterType="com.ycl.common.core.domain.BaseEntity" resultType="com.ycl.domain.vo.ProjectVO">
@@ -194,7 +194,8 @@
<select id="selectProjectDetailByIds" resultType="com.ycl.domain.vo.ProjectVO">
select
TPI.id as id,TPI.project_name,TPI.project_code,TPI.attract_investment,TPI.content,TPI.construction_nature,TPI.project_type,TPI.project_sub_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.tag,TPI.competent_department, TPI.competent_department_person, TPI.competent_department_phone,
+ 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,
TPIF.id,TPIF.project_id,TPIF.total_investment,TPIF.principal,TPIF.government_investment_total,TPIF.central_investment_total,TPIF.central_budget_investment,TPIF.central_fiscal_investment,TPIF.central_special_bond_investment,
--
Gitblit v1.8.0