From 12f73bafbe361f78d68a35de83ca3b3b4d4e0224 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 14 二月 2025 16:27:43 +0800
Subject: [PATCH] 查询待办任务时,判断是否挂起状态

---
 business/src/main/resources/mapper/ProjectInfoMapper.xml |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index d196b96..3fe901c 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
@@ -95,7 +96,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,21 +152,25 @@
             <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.role == 0">
+                and TPI.project_owner_unit = #{query.projectOwnerUnit}
+            </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}
+            <!--${query.params.dataScope}-->
         </where>
         order by TPI.gmt_create
     </select>

--
Gitblit v1.8.0