From 86d368337175a7d7eed5e9330bd80a838ab4f396 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 17:25:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
index 1ab8136..1c579e2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
@@ -4,6 +4,7 @@
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
+
import java.util.Date;
import java.util.List;
@@ -17,21 +18,40 @@
/**
* 鏍规嵁淇℃伅鑾峰彇鍑哄叆搴撲俊鎭�
+ *
* @param deptId
* @param type
* @param start
* @param end
* @return
*/
- @Query("from Fz40InoutRecord where deptId=:deptId and type=:type and updateTime >=:start and updateTime <:end order by updateTime ")
+ @Query("from Fz40InoutRecord where deptId=:deptId and type=:type and updateTime >=:start and updateTime <=:end order by id ")
List<Fz40InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("type") String type, @Param("start") Date start, @Param("end") Date end);
/**
* 鏍规嵁id鑾峰彇绮鍑哄叆搴撲俊鎭�
+ *
* @param id
* @return
*/
@Query("from Fz40InoutRecord where id=:id order by updateTime ")
List<Fz40InoutRecord> listInoutRecordById(@Param("id") String id);
+
+ /**
+ * 鏍规嵁淇℃伅鑾峰彇鍑哄叆搴撲俊鎭�
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ * @return
+ */
+ @Query("from Fz40InoutRecord where deptId=:deptId and updateTime >=:start and updateTime <:end order by id ")
+ List<Fz40InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+
+
+ @Query("from Fz40InoutRecord where deptId=:deptId and (type=:type1 or type=:type2) and updateTime >=:start and updateTime <=:end order by id ")
+ List<Fz40InoutRecord> listInAndOutRecord(@Param("deptId") String deptId, @Param("type1") String type1, @Param("type2") String type2, @Param("start") Date start, @Param("end") Date end);
+
+
}
--
Gitblit v1.9.3