From 93eb5fa83b1b9b4668a8486502d7afe384ad3a65 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Wed, 19 Jun 2024 18:07:51 +0800
Subject: [PATCH] 湖北水库：施工：新增我的上报筛选
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 7e4a4a9..9735f62 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
@@ -22,6 +22,9 @@
<if test="dto.status != null ">
and report.status = #{dto.status}
</if>
+ <if test="dto.reportPerson != null ">
+ and report.report_user = #{dto.reportPerson}
+ </if>
</select>
<select id="queryById" resultType="cn.gistack.sm.sg.VO.SgProgressReportVO">
select * from SG_PROGRESS_REPORT report where id = #{id}
@@ -41,17 +44,20 @@
WHERE
1 = 1
AND userR.is_his = 0
- AND userR.approval_order != 0
<if test="dto.userId != null and dto.userId != ''">
and userR.user_id = #{dto.userId}
</if>
- <if test="dto.approvalStatus != null">
+ <if test="dto.approvalStatus != null and dto.approvalStatus != 3">
and userR.approval_status = #{dto.approvalStatus}
+ AND userR.approval_order != 0
</if>
<choose >
<when test="dto.approvalStatus != null and dto.approvalStatus == 0">
and report.audit_person = #{dto.userId}
</when>
+ <when test="dto.approvalStatus != null and dto.approvalStatus == 3">
+ and report.report_user = #{dto.userId}
+ </when>
</choose>
</select>
<select id="countList" resultType="java.lang.Long">
--
Gitblit v1.9.3