From 87166de391c4e2e03b93cd93b94cdfd255faf958 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期一, 03 七月 2023 15:23:53 +0800
Subject: [PATCH] 数据模板解析

---
 src/main/java/com/product/module/data/service/SystemDataUpLoadService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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..d05a002 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));

--
Gitblit v1.9.2