From 01c29b4b6cfb1a3223cf9e322f33ead42093e77c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 02 四月 2025 09:11:22 +0800
Subject: [PATCH] 类名统一，查询启用赋码规则代码提到service
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index 5615363..8791fc5 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,
@@ -114,6 +116,9 @@
LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit
<where>
TPI.deleted = 0
+ <if test="query.coding !=null and query.coding!=''">
+ and TPI.coding = #{query.coding}
+ </if>
<if test="query.projectName !=null and query.projectName!=''">
and TPI.project_name like concat('%',#{query.projectName},'%')
</if>
@@ -124,7 +129,12 @@
and TPI.project_type = #{query.projectType}
</if>
<if test="query.importanceType !=null and query.importanceType!=''">
- and TPI.importance_type = #{query.importanceType}
+ and (
+ TPI.importance_type like concat('%',#{query.importanceType},'%')
+ <if test="query.importanceType == 'normal'">
+ or TPI.importance_type is null or TPI.importance_type = ''
+ </if>
+ )
</if>
<if test="query.tag !=null and query.tag!=''">
and TPI.tag like concat('%',#{query.tag},'%')
@@ -135,7 +145,8 @@
<if test="query.projectPhase !=null and query.projectPhase!='' and query.projectPhase!=6 and query.projectPhase!=5">
and TPI.project_phase = #{query.projectPhase}
</if>
- <if test="query.projectPhase != null and query.projectPhase != 5 ">
+ /* 鍙涓嶆槸6灏辨煡瀹℃牳閫氳繃鐨勶紝6鏄」鐩腑蹇� */
+ <if test="query.projectPhase != 6">
and TPI.used_status = 2
</if>
<if test="query.fundType !=null and query.fundType!=''">
@@ -156,20 +167,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">
@@ -188,7 +197,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