From 42a7552b9c8603aeab7f0785eb05270dfbeb0bd3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:16:20 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 59 +++++++++++++++++++++++++++++------------------------------
1 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index fffefae..ea83801 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,
@@ -74,7 +76,7 @@
TPIF.county_fiscal_investment as TPIF_county_fiscal_investment,TPIF.county_special_fund_investment as TPIF_county_special_fund_investment,
TPIF.domestic_loan_total as TPIF_domestic_loan_total,TPIF.bank_loan as TPIF_bank_loan,TPIF.foreign_investment_total as TPIF_foreign_investment_total,
TPIF.enterprise_self_raised_total as TPIF_enterprise_self_raised_total,TPIF.other_investment_total as TPIF_other_investment_total,
- TPIF.dept_bond as TPIF_dept_bond,TPIF.national_debt as TPID_national_debt,
+ TPIF.dept_bond as TPIF_dept_bond,TPIF.national_debt as TPIF_national_debt, TPIF.additional_national_debt as TPIF_additional_national_debt,
TPII.be_cross_region as TPII_be_cross_region,TPII.construction_location as TPII_construction_location,
TPII.detailed_address as TPII_detailed_address,TPII.be_compensation_project as TPII_be_compensation_project,TPII.compensation_reason as TPII_compensation_reason,
TPII.planned_start_date as TPII_planned_start_date,TPII.expected_completion_date as TPII_expected_completion_date,
@@ -124,7 +126,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},'%')
@@ -132,17 +139,15 @@
<if test="query.projectStatus !=null and query.projectStatus!=''">
and TPI.project_status = #{query.projectStatus}
</if>
- <if test="query.projectPhase !=null and query.projectPhase!=''">
+ <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=" assignmentStatus !=null and assignmentStatus!=''">-->
-<!-- and TPI.project_phase = #{projectPhase}-->
-<!-- </if>-->
+ /* 鍙涓嶆槸6灏辨煡瀹℃牳閫氳繃鐨勶紝6鏄」鐩腑蹇� */
+ <if test="query.projectPhase != 6">
+ and TPI.used_status = 2
+ </if>
<if test="query.fundType !=null and query.fundType!=''">
and TPI.fund_type = #{query.fundType}
- </if>
- <if test="query.projectPhase !=null and query.projectPhase!=''">
- and TPI.project_phase = #{query.projectPhase}
</if>
<if test="query.investType !=null and query.investType!=''">
and TPI.invest_type = #{query.investType}
@@ -153,28 +158,20 @@
<if test="query.projectStartTime !=null and query.projectEndTime !=null">
and TPI.create_project_time between #{query.projectStartTime} and #{query.projectEndTime}
</if>
- <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'reserve'">
- and TPP.process_ins_id is null
- </if>
- <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
- and TPP.process_ins_id is not null
- </if>
- <if test="query.projectCategory != 6">
- and TPI.used_status = 2
- </if>
- <if test="query.projectCategory == 3">
- and (TPI.project_status = 'working' or TPI.project_status = 'stop')
- </if>
- <if test="query.projectCategory == 6">
-<!-- <if test="query.role == 0">-->
-<!-- and TPI.used_status != 2-->
+<!-- <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'reserve'">-->
+<!-- and TPP.process_ins_id is null-->
+<!-- </if>-->
+<!-- <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.role != null and query.role == 1">-->
+<!-- and TPI.competent_department = #{query.competentDepartment}-->
<!-- </if>-->
- <if test="query.role == 1">
- and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
- </if>
- </if>
<!-- 涓氫富鏁版嵁鏉冮檺 -->
- <if test="query.role == 0">
+ <if test="query.role != null and query.role == 0">
${query.params.dataScope}
</if>
</where>
@@ -197,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,
@@ -208,6 +206,7 @@
TPIF.create_by,TPIF.gmt_update,TPIF.update_by,
TPIF.dept_bond,
TPIF.national_debt,
+ TPIF.additional_national_debt,
TPII.id,TPII.project_id,TPII.be_cross_region,TPII.construction_location,TPII.detailed_address,TPII.be_compensation_project,TPII.compensation_reason,TPII.planned_start_date,
TPII.expected_completion_date,TPII.national_industry_classification,TPII.industry_classification,TPII.project_nature,TPII.project_attribute,
TPII.use_earth,TPII.content_scale,TPII.code,TPII.gmt_create,TPII.create_by,TPII.gmt_update, TPII.update_by,
--
Gitblit v1.8.0