From e9719f559ccaa5ab0689df9331f4d016c0b8c9e6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 24 二月 2025 20:44:47 +0800
Subject: [PATCH] 项目直接使用项目阶段

---
 business/src/main/resources/mapper/ProjectInfoMapper.xml |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index fffefae..541ef51 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -132,17 +132,14 @@
             <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>-->
+            <if test="query.projectPhase != '6' and query.projectPhase!='5'">
+                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}
@@ -159,22 +156,16 @@
             <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">
+            <if test="query.projectPhase == '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>-->
-                <if test="query.role == 1">
+            <if test="query.projectPhase == '6'">
+                <if test="query.role != null and 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>

--
Gitblit v1.8.0