From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java
index a3b67b6..b7d2478 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java
@@ -15,7 +15,7 @@
public interface EquipmentInfoRepository extends BaseMapper<EquipmentInfo> {
@Select("<script> select count(1) from equipment_info m INNER JOIN \n" +
- "(select a.id,max(b.takecare_date) mdate from equipment_info a INNER JOIN equipment_takecare_detail b on a.id = b.equipment_id GROUP BY b.equipment_id) n \n" +
- "on m.id = n.id where DATEDIFF(NOW(),n.mdate) >m.takecare_cycle</script> ")
+ "(select a.id,max(b.takecare_date) mdate from equipment_info a INNER JOIN equipment_takecare_detail b on a.id = b.equipment_id WHERE a.del_flag = 0 AND b.del_flag = 0 GROUP BY b.equipment_id) n \n" +
+ "on m.id = n.id where DATEDIFF(NOW(),n.mdate) >m.takecare_cycle AND m.del_flag = 0</script> ")
Object countOverTime();
}
\ No newline at end of file
--
Gitblit v1.9.2