From 44d30cbd79df473dbdf6d28decde2bbc931c0821 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 30 Aug 2024 18:19:47 +0800
Subject: [PATCH] 湖北水库：工程项目树数量修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index 99dbac3..614bb45 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -31,6 +31,7 @@
         <if test="dto.endTime != null and dto.endTime !='' ">
             and report.report_time &lt;= #{dto.endTime}
         </if>
+        order by report_time desc
     </select>
 
     <select id="queryPageListAll" resultType="cn.gistack.sm.sg.VO.SgProgressReportVO">
@@ -59,6 +60,7 @@
         <if test="dto.endTime != null and dto.endTime != ''">
             and report.create_time &lt;= #{dto.endTime}
         </if>
+        order by report.report_time desc
     </select>
 
     <select id="queryById" resultType="cn.gistack.sm.sg.VO.SgProgressReportVO">
@@ -113,6 +115,7 @@
         <if test="dto.endTime != null and dto.endTime !='' ">
             and report.report_time &lt;= #{dto.endTime}
         </if>
+        order by report.report_time desc
         <!--<choose >
             <when test="dto.approvalStatus != null and dto.approvalStatus == 0">
                 and report.audit_person = #{dto.userId} and (report."STATUS" = 0 or report."STATUS" = 1)
@@ -148,7 +151,8 @@
             step.gx_step_name AS stepName,
             step.gx_step_num AS stepNum,
             re.STATUS AS approvalStatus,
-            re.report_time
+            re.report_time,
+            re.resubmit
         FROM
             ywxt.sg_gx_step step
                 LEFT JOIN ywxt.sg_gx gx ON step.gx_info_id = gx.id

--
Gitblit v1.9.3