From ad6a05f2535c1f29a764f352d8ca666cae1b97d1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 22 二月 2025 17:06:28 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/project_management-java
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index d196b96..f81ae05 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -16,7 +16,9 @@
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,
@@ -45,7 +47,11 @@
TPI.gmt_update,
TPI.update_by,
TPI.create_by,
- TPI.id
+ TPI.remark,
+ TPI.id,
+ TPI.industry_competent_department,
+ TPI.industry_competent_department_person,
+ TPI.department_person_phone
FROM
t_project_info TPI
WHERE
@@ -95,7 +101,7 @@
TPURI.contact_address as TPURI_contact_address,
TPURI.post_code as TPURI_post_code,
TPURI.email as TPURI_email,
- TPI.coding
+ d.dept_name as project_owner_unit_name
FROM
t_project_info TPI
LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0
@@ -151,23 +157,26 @@
<if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
and TPP.process_ins_id is not null
</if>
- <if test="query.projectCategory == null">
+ <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.create_by = #{query.createBy}
- </if>
+<!-- <if test="query.role == 0">-->
+<!-- and TPI.used_status != 2-->
+<!-- </if>-->
<if test="query.role == 1">
- and TPI.used_status = #{query.usedStatus}
+ 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">
@@ -185,7 +194,7 @@
<select id="selectProjectDetailByIds" resultType="com.ycl.domain.vo.ProjectVO">
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.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.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,
@@ -223,4 +232,17 @@
<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}
+ <if test="code !=null and code !=''">
+ or p.project_code =#{code}
+ </if>
+ having p.id != #{id}
+
+ </select>
+
</mapper>
--
Gitblit v1.8.0