From 43ae450db3ce85b425169e4fcef6ac7c25407f52 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 28 十月 2019 09:47:37 +0800
Subject: [PATCH] 2.0.2
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
index 83c40d2..bcf883a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -22,11 +22,11 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
-import org.yeshi.utils.CsvUtil;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.entity.wx.RedPackRecord;
+import org.yeshi.utils.wx.WXRedPackUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -1165,7 +1165,7 @@
}
try {
- List<RedPackRecord> list = CsvUtil.getCsvData(file, RedPackRecord.class);
+ List<RedPackRecord> list = WXRedPackUtil.readCsv(file.getInputStream());
extractService.updateManualExtractRecord(list);
out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
} catch (ExtractException e) {
@@ -1176,6 +1176,15 @@
}
}
+
+ public static String getValue(String[] item,int index){
+ if(item.length > index){
+ String value = item[index];
+ return value;
+ }
+ return "";
+ }
+
/**
* 棰勮绾㈠寘鍙戠敓浜�
*
@@ -1225,5 +1234,5 @@
e.printStackTrace();
}
}
-
}
+
--
Gitblit v1.8.0