From fb04d0c2e44f0c4943a83c831849eda9fc67ab27 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期一, 03 七月 2023 16:45:48 +0800
Subject: [PATCH] 数据模板解析
---
src/main/java/com/product/module/data/service/SystemDataUpLoadService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/module/data/service/SystemDataUpLoadService.java b/src/main/java/com/product/module/data/service/SystemDataUpLoadService.java
index 9778d34..4ffb3f6 100644
--- a/src/main/java/com/product/module/data/service/SystemDataUpLoadService.java
+++ b/src/main/java/com/product/module/data/service/SystemDataUpLoadService.java
@@ -422,12 +422,14 @@
String before_func = dt.getString(i, CmnConst.FIELD_BEFORE_FUNC);
String after_func = dt.getString(i, CmnConst.FIELD_AFTER_FUNC);
String table_name = dt.getString(i, CmnConst.TABLE_NAME);
+ String startRowIndex = dt.getString(i, "start_row_index");
FieldSetEntity f = new FieldSetEntity();
f.setTableName("sheet_info");
f.setValue(CmnConst.FIELD_BEFORE_FUNC, before_func);
f.setValue(CmnConst.FIELD_AFTER_FUNC, after_func);
f.setValue(CmnConst.UUID, dt.getString(i, CmnConst.UUID));
f.setValue(CmnConst.TABLE_NAME, table_name);
+ f.setValue("start_row_index", startRowIndex);
f.setSubData(dt.getFieldSetEntity(i).getSubData());
sub.addFieldSetEntity(f);
}
@@ -620,7 +622,7 @@
//琛ㄥご寮�濮嬭 cheng update 2023骞�6鏈�30鏃�15:48:22 澶氳澶存椂锛岃〃澶村紑濮嬭涓嶄竴瀹氭槸绗竴琛�
int startRowIndex = 1;
if (!StringUtils.isEmpty(curTemplateFse.getString("start_row_index")) && NumberUtil.isNumber(curTemplateFse.getString("start_row_index"))) {
- startRowIndex = Integer.parseInt(curTemplateFse.getString("start_row_index")) + 1;
+ startRowIndex = Integer.parseInt(curTemplateFse.getString("start_row_index"));
if (startRowIndex < 1) {
startRowIndex = 1;
}
@@ -632,7 +634,7 @@
} else {
headerDataList.add(new ArrayList<>());
}
- for (int i = startRowIndex; i < dataList.size(); i++) {
+ for (int i = startRowIndex + 1; i < dataList.size(); i++) {
rowList = dataList.get(i);
recordFse = new FieldSetEntity();
recordFse.setTableName(curTemplateFse.getString(CmnConst.FIELD_TABLE_NAME));
@@ -762,6 +764,12 @@
return resultMap;
}
+ public static void main(String[] args) {
+ Class<?> a = DataTableEntity.class;
+ Class<DataTableEntity> b = DataTableEntity.class;
+ System.out.println(a.equals(b));
+ }
+
/**
* 浜嬩欢鍓嶆垨鑰呬簨浠跺悗璋冪敤閫昏緫鏂规硶鐨勭壒娈婂鐞�
*
@@ -785,8 +793,9 @@
//浣跨敤huTool鐨勫弽灏勫伐鍏风被鑾峰彇鏂规硶锛屾柟娉曠殑鍙傛暟绫诲瀷涓篋ataTableEntity銆丩ist<List<String>>
Method method = ReflectUtil.getMethod(bean.getClass(), methodName, DataTableEntity.class, List.class);
if (method != null) {
- //鍒ゆ柇method杩斿洖鍊间负DataTableEntity
- boolean isBackDataTable = !method.getReturnType().equals(DataTableEntity.class);
+ Type genericReturnType = method.getGenericReturnType();
+ //鍒ゆ柇method杩斿洖鍊间负DataTableEntity.class
+ boolean isBackDataTable = genericReturnType.getTypeName().equals("com.product.core.entity.DataTableEntity");
//鍒ゆ柇绗簩涓弬鏁扮殑娉涘瀷绫诲瀷
Type[] types = method.getGenericParameterTypes();
Type type = types[1];
--
Gitblit v1.9.2