From 766effa6e04db9b37b1dc3886d988beaa595c38d Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 12 十二月 2023 09:04:55 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/screen/src/main/resources/mapping/BigScreenMapper.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/hd/pipe/screen/src/main/resources/mapping/BigScreenMapper.xml b/hd/pipe/screen/src/main/resources/mapping/BigScreenMapper.xml
index 51b8d7e..b394089 100644
--- a/hd/pipe/screen/src/main/resources/mapping/BigScreenMapper.xml
+++ b/hd/pipe/screen/src/main/resources/mapping/BigScreenMapper.xml
@@ -235,6 +235,11 @@
<select id="queryGroups" resultType="com.thhy.screen.modules.biz.audio.entity.AudioGroup">
select id,group_id as groupId,group_name as groupName from t_audio_group
+ <where>
+ <if test="groupId != null and groupId !=''">
+ id = #{groupId}
+ </if>
+ </where>
</select>
<!--钢筋总消耗，周消耗，月消耗-->
@@ -264,6 +269,7 @@
where ssr.stock_type = 2 and YEAR(SYSDATE()) = YEAR(ssr.create_time) and MONTH(SYSDATE()) = MONTH(ssr.create_time)
group by ssr.steel_id
) c on steel.steel_id = c.steel_id
+ ORDER BY c.monthStock desc
</select>
<!--获取静养区-->
@@ -278,6 +284,9 @@
<if test="id !=null and id !=''">
id,
</if>
+ <if test="name !=null and name !=''">
+ name,
+ </if>
<if test="groupId !=null and groupId !=''">
group_id,
</if>
@@ -292,6 +301,9 @@
<if test="id !=null and id !=''">
#{id},
</if>
+ <if test="name !=null and name !=''">
+ #{name},
+ </if>
<if test="groupId !=null and groupId !=''">
#{groupId},
</if>
--
Gitblit v1.9.3