From b134ac3690e6d31d40ee6def5c65fb778050a556 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 11 九月 2023 17:34:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index c0ea329..c7ec473 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -10,7 +10,7 @@
@Mapper
public interface HomeMapper {
//鏌ヨ姣忎釜绗煎瓙鐨勪娇鐢ㄦ儏鍐�
- @Select("SELECT cage,round(round(sum(state)/42,2)*100) as cell,42-sum(state) as state FROM storage_cage group by cage")
+ @Select("SELECT cage,ROUND(sum(case when state=1 or state=2 or state=3 then 1 else 0 end)/42*100) as cell,42-sum(case when state=1 or state=2 or state=3 then 1 else 0 end) as state FROM `storage_cage` group by cage")
List<StorageCage> selectAll();
// 鏌ヨ1-5绗煎唴灞傛牸瀛愮姸鎬�
@@ -62,6 +62,6 @@
void UpdateCageTask2(@Param("cell") Integer cell);
//鑾峰彇鎶ヨ淇℃伅
- @Select("select * from alarmmg where endTime is null")
+ @Select("select id,content,timeon as timeons,endTime from alarmmg where endTime is null")
List<alarmmg> SelectAlarmmgInfo();
}
--
Gitblit v1.8.0