From f5a366b2c3b200006983f3a40872bc4976a884d7 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 11 二月 2025 18:38:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index ac32a87..468764e 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -45,6 +45,7 @@
TPI.gmt_update,
TPI.update_by,
TPI.create_by,
+ TPI.remark,
TPI.id
FROM
t_project_info TPI
@@ -103,9 +104,9 @@
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
- and TPI.used_status = 2
<if test="query.projectName !=null and query.projectName!=''">
and TPI.project_name like concat('%',#{query.projectName},'%')
</if>
@@ -151,19 +152,40 @@
<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.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-->
+<!-- </if>-->
+ <if test="query.role == 1">
+ and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
+ </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">
--
Gitblit v1.8.0