From 64b14b0549344f13b191e2c26ed199f62655c43f Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 25 二月 2026 10:12:46 +0800
Subject: [PATCH] 导入测试

---
 service-api/src/main/java/com/java110/api/importData/adapt/ImportElectricityFeeV2DataCleaningAdapt.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportElectricityFeeV2DataCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportElectricityFeeV2DataCleaningAdapt.java
index 22100fc..6ffc5f0 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportElectricityFeeV2DataCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportElectricityFeeV2DataCleaningAdapt.java
@@ -49,7 +49,7 @@
         sheet = ImportExcelUtils.getSheet(workbook, "鐢佃垂娴佹按");
         List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
         for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
-            if (osIndex < 8) {
+            if (osIndex < 9) {
                 continue;
             }
             Object[] os = oList.get(osIndex);
@@ -74,8 +74,8 @@
             Date date = new Date();
             date.setYear(defaultInteger(os[18]) - 1900);
             date.setMonth(defaultInteger(os[19]));
-            po.setCurReadingTime(defaultInteger(os[18]) + "-" + defaultInteger(os[19]) + "-01 00:00:00");
-            po.setPreReadingTime(DateUtil.getAddMonthStringA(DateUtil.getDateFromStringA(po.getCurReadingTime()), -1));
+            po.setPreReadingTime(defaultInteger(os[18]) + "-" + defaultInteger(os[19]) + "-01 00:00:00");
+            po.setCurReadingTime(Vtil.processDateEnhanced(DateUtil.getDateFromStringA(po.getPreReadingTime()), "end", DateUtil.DATE_FORMATE_STRING_A, null ,null));
             po.setStatusCd("0");
             po.setUserId(paramIn.getString("userId"));
             po.setRemark(ValueUtil.defaultValue(os[28]));

--
Gitblit v1.8.0