From feb39b032f50cf5c3770a821652c132a15bcfef1 Mon Sep 17 00:00:00 2001
From: zhangk <zhangk@gisuni.com>
Date: Mon, 24 Jun 2024 18:57:12 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into develop_zk
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml | 6 ++++++
1 files changed, 6 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 420c275..6857e4a 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
@@ -51,6 +51,12 @@
WHERE
1 = 1
<!-- AND userR.is_his = 0 -->
+ <if test="dto.projectName != null and dto.projectName != ''">
+ and report.PROGRAM_NAME like CONCAT(CONCAT('%',#{dto.projectName}),'%')
+ </if>
+ <if test="dto.deviceName != null and dto.deviceName != ''">
+ and de.device_name like CONCAT(CONCAT('%', #{dto.deviceName}), '%')
+ </if>
<if test="dto.userId != null and dto.userId != ''">
and userR.user_id = #{dto.userId}
</if>
--
Gitblit v1.9.3