From c1a9747777ea9aee817f306475c94031e5559cc4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 23 四月 2025 20:04:12 +0800
Subject: [PATCH] 项目、工程按照录入时间升序排列

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

diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index 2b37ad7..2c6acca 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -116,6 +116,9 @@
         LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit
         <where>
             TPI.deleted = 0
+            <if test="query.coding !=null and query.coding!=''">
+                and TPI.coding = #{query.coding}
+            </if>
             <if test="query.projectName !=null and query.projectName!=''">
                 and TPI.project_name like concat('%',#{query.projectName},'%')
             </if>
@@ -164,20 +167,18 @@
 <!--            <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">-->
 <!--                and TPP.process_ins_id is not null-->
 <!--            </if>-->
-            <if test="query.projectPhase == 3">
-                and (TPI.project_status = 'working' or TPI.project_status = 'stop')
-            </if>
-            <if test="query.projectPhase == null">
-                <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.projectPhase == 3">-->
+<!--                and (TPI.project_status = 'working' or TPI.project_status = 'stop')-->
+<!--            </if>-->
+<!--                <if test="query.role != null and query.role == 1">-->
+<!--                    and TPI.competent_department = #{query.competentDepartment}-->
+<!--                </if>-->
             <!-- 涓氫富鏁版嵁鏉冮檺 -->
             <if test="query.role != null and query.role == 0">
                 ${query.params.dataScope}
             </if>
         </where>
-        order by TPI.id DESC
+        ORDER BY FIELD(TPI.used_status, 1, -1, 0, 2), TPI.gmt_create ASC
     </select>
 
     <select id="homeCount" parameterType="com.ycl.common.core.domain.BaseEntity" resultType="com.ycl.domain.vo.ProjectVO">

--
Gitblit v1.8.0