From 17e9ad4bbbbd0129e8da4dc0cfeee0028d7121e0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 24 二月 2025 17:40:23 +0800
Subject: [PATCH] 资金类型和重点分类多选
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index dc078f0..fffefae 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.attract_investment,
TPI.construction_nature,
TPI.project_type,
TPI.project_sub_type,
@@ -73,6 +74,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,
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,
@@ -163,10 +165,6 @@
<if test="query.projectCategory == 3">
and (TPI.project_status = 'working' or TPI.project_status = 'stop')
</if>
- <!-- 涓氫富鏁版嵁鏉冮檺 -->
- <if test="query.role == 0">
- and TPI.project_owner_unit = #{query.projectOwnerUnit}
- </if>
<if test="query.projectCategory == 6">
<!-- <if test="query.role == 0">-->
<!-- and TPI.used_status != 2-->
@@ -175,9 +173,12 @@
and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
</if>
</if>
- <!--${query.params.dataScope}-->
+ <!-- 涓氫富鏁版嵁鏉冮檺 -->
+ <if test="query.role == 0">
+ ${query.params.dataScope}
+ </if>
</where>
- order by TPI.gmt_create
+ order by TPI.id DESC
</select>
<select id="homeCount" parameterType="com.ycl.common.core.domain.BaseEntity" resultType="com.ycl.domain.vo.ProjectVO">
@@ -187,7 +188,7 @@
LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
LEFT JOIN sys_dept d ON TPI.project_owner_unit = d.dept_id
<where>
- TPI.deleted = 0
+ TPI.deleted = 0 AND TPI.used_status = 2
${params.dataScope}
</where>
@@ -195,7 +196,7 @@
<select id="selectProjectDetailByIds" resultType="com.ycl.domain.vo.ProjectVO">
select
- TPI.id as id,TPI.project_name,TPI.project_code,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.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.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,
@@ -205,6 +206,8 @@
TPIF.county_investment_total,TPIF.county_budget_investment,TPIF.county_fiscal_investment,
TPIF.county_special_fund_investment,TPIF.domestic_loan_total,TPIF.bank_loan,TPIF.foreign_investment_total,TPIF.enterprise_self_raised_total,TPIF.other_investment_total,TPIF.gmt_create,
TPIF.create_by,TPIF.gmt_update,TPIF.update_by,
+ TPIF.dept_bond,
+ TPIF.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,
@@ -230,7 +233,20 @@
</if>
</where>
</select>
+
<select id="queryById" resultType="com.ycl.domain.entity.ProjectInfo">
select * from t_project_info where id = #{id} and deleted = 0
</select>
+
+ <resultMap id="pInfo" type="com.ycl.domain.entity.ProjectInfo">
+ <id column="id" property="id"/>
+ </resultMap>
+ <select id="checkProjectNameAndIdIsUnique" resultMap="pInfo">
+ select p.id from t_project_info p where p.project_name =#{name} and p.id != #{id} and p.deleted = 0
+ <if test="code !=null and code !=''">
+ and p.project_code =#{code}
+ </if>
+
+ </select>
+
</mapper>
--
Gitblit v1.8.0