人员考勤调整：导出区分年度和月度

zouyu

2026-04-14 948194840fc18c00617cbf3cf72f9e81bb0ee5b3

 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;