From 17c6b91fb7dd896b48922df9c648010478ddce06 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 08 Aug 2024 12:06:08 +0800
Subject: [PATCH] 湖北水库：上报添加时间筛选、项目列表添加排序
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 3573102..615ac00 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
@@ -25,6 +25,12 @@
<if test="dto.reportPerson != null ">
and report.report_user = #{dto.reportPerson}
</if>
+ <if test="dto.startTime != null and dto.startTime !='' ">
+ and report.report_time >= #{dto.startTime}
+ </if>
+ <if test="dto.endTime != null and dto.endTime !='' ">
+ and report.report_time <= #{dto.endTime}
+ </if>
</select>
<select id="queryPageListAll" resultType="cn.gistack.sm.sg.VO.SgProgressReportVO">
@@ -101,6 +107,12 @@
</if>
AND userR.approval_order != 0
</if>
+ <if test="dto.startTime != null and dto.startTime !='' ">
+ and report.report_time >= #{dto.startTime}
+ </if>
+ <if test="dto.endTime != null and dto.endTime !='' ">
+ and report.report_time <= #{dto.endTime}
+ </if>
<choose >
<when test="dto.approvalStatus != null and dto.approvalStatus == 0">
and report.audit_person = #{dto.userId} and (report."STATUS" = 0 or report."STATUS" = 1)
--
Gitblit v1.9.3