From ed06303a918ac8b1c7492652c24aed477e53fd8a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 09 二月 2026 23:45:47 +0800
Subject: [PATCH] 客户问题优化调整8-修改过磅单

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 41 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 83b5c7d..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);
     }
 
@@ -70,6 +71,30 @@
         }
 
         return cameraMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 鑾峰彇鏇存柊鐩戞帶鏁伴噺
+     * @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);
     }
 
     /**
@@ -99,6 +124,21 @@
     }
 
     /**
+     * 杩滅▼鎷夊彇鐩戞帶淇℃伅鍚庢洿鏂�
+     * @param data
+     */
+    public void pullUpdateCamera(Camera data) {
+        data.setUpdateBy(ContextUtil.getLoginUserName());
+        data.setUpdateTime(new Date());
+        int i = cameraMapper.updateById(data);
+        if(i == 0){
+            data.setCreateBy(ContextUtil.getLoginUserName());
+            data.setCreateTime(new Date());
+            cameraMapper.insert(data);
+        }
+    }
+
+    /**
      * 鍒犻櫎鏁版嵁
      * @param data
      * @return

--
Gitblit v1.9.3