From 948194840fc18c00617cbf3cf72f9e81bb0ee5b3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 14 四月 2026 16:50:00 +0800
Subject: [PATCH] 人员考勤调整：导出区分年度和月度
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
index 9e786ce..65fdff7 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
@@ -197,9 +197,6 @@
@Override
public Result<?> dataAcquisition(HttpServletRequest request, DeviceCollectionDto dto) {
-
-
-
// 鏌ヨ妫�楠岄」
List<Integer> itemIds = dto.getItemIds();
if (CollectionUtils.isEmpty(itemIds)) {
@@ -240,11 +237,13 @@
// 鏁伴噰杩斿洖淇℃伅
Map<String, Object> map = new HashMap<>();
for (Device device : deviceList) {
-
Device device1 = deviceMapper.selectById(device.getId());
dto.setDbUserName(device1.getDbUserName());
dto.setDbPassword(device1.getDbPassword());
- dto.setDbTable(device1.getDbTable());
+ //NS-YL3141:鍝戦搩鐗囧叏鑷姩妫�娴嬪疄楠屽
+ if(!StringUtils.equals(device1.getManagementNumber(),"NS-YL3141")){
+ dto.setDbTable(device1.getDbTable());
+ }
String ip = device.getIp();
// 鏍规嵁妫�楠岄」鑾峰彇config
--
Gitblit v1.9.3