From 9e28453dba6ecf93c6c2234ba38def7c41cf12f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index dc922e4..d196b96 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -94,7 +94,8 @@
TPURI.wechat as TPURI_wechat,
TPURI.contact_address as TPURI_contact_address,
TPURI.post_code as TPURI_post_code,
- TPURI.email as TPURI_email
+ TPURI.email as TPURI_email,
+ TPI.coding
FROM
t_project_info TPI
LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0
@@ -102,6 +103,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
<where>
TPI.deleted = 0
<if test="query.projectName !=null and query.projectName!=''">
@@ -149,23 +151,60 @@
<if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
and TPP.process_ins_id is not null
</if>
+ <if test="query.projectCategory == null">
+ 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.create_by = #{query.createBy}
+ </if>
+ <if test="query.role == 1">
+ and TPI.used_status = #{query.usedStatus}
+ </if>
+ </if>
+ ${query.params.dataScope}
</where>
order by TPI.gmt_create
</select>
- <select id="homeCount" resultType="com.ycl.domain.vo.ProjectVO">
+ <select id="homeCount" parameterType="com.ycl.common.core.domain.BaseEntity" resultType="com.ycl.domain.vo.ProjectVO">
SELECT TPI.*,TPIF.total_investment,TPP.process_ins_id as processId
FROM t_project_info TPI
LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0
LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
- WHERE TPI.deleted = 0
+ LEFT JOIN sys_dept d ON TPI.project_owner_unit = d.dept_id
+ <where>
+ TPI.deleted = 0
+ ${params.dataScope}
+ </where>
+
</select>
<select id="selectProjectDetailByIds" resultType="com.ycl.domain.vo.ProjectVO">
- select *
+ 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.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,
+ 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,
+ TPIF.central_special_fund_investment,TPIF.provincial_investment_total,
+ TPIF.provincial_budget_investment,TPIF.provincial_fiscal_investment,TPIF.provincial_special_fund_investment,TPIF.city_investment_total,TPIF.city_budget_investment,TPIF.city_fiscal_investment,TPIF.city_special_fund_investment,
+ 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,
+ 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,
+ TPIPC.id as policyId,TPIPC.project_id,TPIPC.belongs_to_industry_adjustment_directory,TPIPC.belongs_to_western_encouraged_directory,TPIPC.not_banned_or_controlled_project,TPIPC.information_is_true,TPIPC.special_planning_compliance,
+ TPIPC.annual_energy_consumption,TPIPC.annual_electricity_consumption,TPIPC.energy_check,TPIPC.no_only_check_type,TPIPC.remarks,TPIPC.gmt_create,
+ TPIPC.gmt_update,TPIPC.create_by,TPIPC.update_by,
+ TPURI.id,TPURI.project_id,TPURI.total_investment,TPURI.project_unit,TPURI.project_unit_type,
+ TPURI.registration_type,TPURI.holding_situation,TPURI.certificate_type,TPURI.certificate_number,TPURI.registered_address,TPURI.registered_capital,
+ TPURI.legal_representative,TPURI.fixed_phone,TPURI.legal_person_idcard,TPURI.project_contact_person,TPURI.phone,TPURI.contact_idcard,
+ TPURI.wechat,TPURI.contact_address,TPURI.post_code,TPURI.email,TPURI.create_by,TPURI.update_by,TPURI.gmt_create,TPURI.gmt_update
from t_project_info TPI
left join t_project_investment_funding TPIF on TPI.id = TPIF.project_id and TPIF.deleted = 0
left join t_project_investment_info TPII on TPI.id = TPII.project_id and TPII.deleted = 0
--
Gitblit v1.8.0