Commit 1269e244 by chenweisong

更新

parent f108b2f7
...@@ -169,12 +169,12 @@ public class TemplateController { ...@@ -169,12 +169,12 @@ public class TemplateController {
params.setHeadRows(1); params.setHeadRows(1);
ExcelImportResult<BankData> excelImportResult = ExcelImportUtil. ExcelImportResult<BankData> excelImportResult = ExcelImportUtil.
importExcelMore(new FileInputStream(new File(template.getUpStreamAddr())), BankData.class, params); importExcelMore(new FileInputStream(new File(template.getUpStreamAddr())), BankData.class, params);
List<BankData> bankDataList = excelImportResult.getList(); List<BankData> allBankDataList = excelImportResult.getList();
String breakColumnEn = ExcelModelColumnUtils.getBreakColumn(template.getColumnName()); String breakColumnEn = ExcelModelColumnUtils.getBreakColumn(template.getColumnName());
if (StringUtils.isBlank(breakColumnEn)) { if (StringUtils.isBlank(breakColumnEn)) {
} else { } else {
for (BankData bd : bankDataList) { for (BankData bd : allBankDataList) {
Method m = bd.getClass().getMethod("get" + breakColumnEn); Method m = bd.getClass().getMethod("get" + breakColumnEn);
if (breakResultMap.get(m.invoke(bd) + "") != null) { if (breakResultMap.get(m.invoke(bd) + "") != null) {
breakResultMap.get(m.invoke(bd) + "").add(bd); breakResultMap.get(m.invoke(bd) + "").add(bd);
...@@ -186,9 +186,6 @@ public class TemplateController { ...@@ -186,9 +186,6 @@ public class TemplateController {
} }
} }
} catch (Exception e) {
e.printStackTrace();
}
// if (missionType == CommonConstant.MISSION_TYPE_DATA_ENTER) { // if (missionType == CommonConstant.MISSION_TYPE_DATA_ENTER) {
// } else if (missionType == CommonConstant.MISSION_TYPE_DATA_AUDIT) { // } else if (missionType == CommonConstant.MISSION_TYPE_DATA_AUDIT) {
...@@ -213,6 +210,11 @@ public class TemplateController { ...@@ -213,6 +210,11 @@ public class TemplateController {
listArrayList.add(array); listArrayList.add(array);
}); });
return listArrayList; return listArrayList;
} catch (Exception e) {
e.printStackTrace();
}
return null;
} }
@ApiOperation(value = "获取txt或者dat文件的数据", hidden = true) @ApiOperation(value = "获取txt或者dat文件的数据", hidden = true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment