From 1eddf64a7104dcd06065e8ac309eebc42c24fb05 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 14:29:56 +0800
Subject: [PATCH] 出入库记录导入,判重兜底校验纠正
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java
index ae72ad5..9ef68de 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java
@@ -6,6 +6,7 @@
import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.mapper.CameraMapper;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
@@ -50,7 +51,7 @@
if(StringUtils.isNotBlank(param.getSpdwlx())){
queryWrapper.eq("spdwlx", param.getSpdwlx());
}
-
+ queryWrapper.orderByAsc("order_num");
cameraMapper.selectPage(page, queryWrapper);
}
@@ -73,6 +74,30 @@
}
/**
+ * 鑾峰彇鏇存柊鐩戞帶鏁伴噺
+ * @param deptId
+ * @param start
+ * @param end
+ * @return
+ */
+ public int getUpdateCount(String deptId, Date start, Date end) {
+
+ QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();
+
+ if(StringUtils.isNotBlank(deptId)){
+ queryWrapper.eq("dept_id", deptId);
+ }
+ if (null != start) {
+ queryWrapper.ge("update_time", start);
+ }
+ if (null != end) {
+ queryWrapper.le("update_time", end);
+ }
+
+ return cameraMapper.selectCount(queryWrapper);
+ }
+
+ /**
* 淇濆瓨鏁版嵁
* @param data
*/
--
Gitblit v1.9.3