From c5f6f451fcd2a5257315590c5a256766fa68e433 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 19 Aug 2024 14:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
index 0efb6c0..24c0609 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -43,7 +43,10 @@
</foreach>
</if>
<if test="dto.projectSort == null or dto.projectSort ==0">
- ORDER BY info.status desc
+ ORDER BY info.status desc ,info.project_progress desc
+ </if>
+ <if test="dto.projectSort ==1">
+ ORDER BY info.project_progress desc
</if>
<if test="dto.projectSort != null and dto.projectSort ==2">
ORDER BY info.sk_id asc
@@ -360,6 +363,9 @@
</foreach>
</if>
</select>
+ <select id="selectVOById" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">
+ select * from ywxt.sg_project_info pro where pro.id = #{proframId}
+ </select>
<!-- <select id="getProjectIds" resultType="java.lang.String">-->
<!-- </select>-->
--
Gitblit v1.9.3