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/utils/DataAcquisition.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
index 8e600f3..685742a 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
@@ -82,6 +82,9 @@
String mdbEntrustCode = StringUtils.isNotBlank(device.getEntrustCode())?device.getEntrustCode():"";
String mdbSampleCode = StringUtils.isNotBlank(device.getSampleCode())?device.getSampleCode():"";
String dbFileName = StringUtils.isNotBlank(device.getDbFileName())?device.getDbFileName():"";
+ String colorTag = StringUtils.isNotBlank(cableTag)?cableTag:"";
+ String lotBatchNoStr = StringUtils.isNotBlank(lotBatchNo)?lotBatchNo:"";
+ String lastSql = StringUtils.isNotBlank(device.getLastSql())?device.getLastSql():"";
String http = HTTP + ip + GETFILE +
"?filePath=" + device.getCollectUrl() +
"&fileExtension=" + device.getFileType() +
@@ -92,8 +95,9 @@
"&dbFileName=" + dbFileName +
"&dbUserName=" + dbUserName +
"&dbPassword=" + dbPassword +
- "&lotBatchNo=" + lotBatchNo +
- "&cableTag=" + cableTag +
+ "&lotBatchNo=" + lotBatchNoStr +
+ "&cableTag=" + colorTag +
+ "&lastSql=" + lastSql +
"&dbTable=" + dbTable;
System.out.println("璇锋眰鐨� URL: " + http);
String result = null;
--
Gitblit v1.9.3