From cf119adeab46dcc843c4c7b28a719a0c027d7c88 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 26 Jul 2024 15:13:52 +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 | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 3bff4cf..ad255da 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
@@ -21,6 +21,21 @@
<if test="dto.skName != null and dto.skName != ''">
and info.sk_name like concat(concat('%',#{dto.skName}),'%')
</if>
+ <if test="dto.resCd != null and dto.resCd != '' ">
+ and info.sk_id like CONCAT(CONCAT('%', #{dto.resCd}), '%')
+ </if>
+ <if test="dto.engScal != null and dto.engScal != '' ">
+ and dria."eng_scal" like CONCAT(CONCAT('%', #{dto.engScal}), '%')
+ </if>
+ <if test="dto.status != null">
+ and info.status = #{dto.status}
+ </if>
+ <if test="dto.isBegin != null and dto.isBegin == 1">
+ and info.status in(1,2)
+ </if>
+ <if test="dto.isBegin != null and dto.isBegin == 2">
+ and info.status = 0
+ </if>
<if test="dto.projectIds != null and dto.projectIds.size > 0">
and info.id in
<foreach collection="dto.projectIds" item="id" separator="," open="(" close=")">
--
Gitblit v1.9.3