MVP1.6.2-工资原表识别-优化

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/SalaryUploadParamVo.java

@@ -36,6 +36,10 @@ public class SalaryUploadParamVo {
 	// 代发户的配置list
 	List<TSalaryStandardIssueRes> resList;
 
+	// 原表识别，返回校验信息给前端
 	List<TCheckIdCard> checkList;
 
+	// 数据行，从0开始计数的
+	Integer dataNum;
+
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java

@@ -710,7 +710,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 			String jsonString = null;
 			InputStream inputStream = file.getInputStream();
 			R<ExcelSheetVo> voR;
-			ExcelSheetVo vo = null;
+			ExcelSheetVo vo;
 			//根据文件格式 对应不同的api解析
 			if (filename.endsWith(".xlsx")) {
 				voR = readXlsx(inputStream, specialIdCardList, false, sheetName);
@@ -859,6 +859,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 				// 最后转化为jsonString
 				jsonString = JSON.toJSON(contentList).toString();
 				SalaryUploadParamVo returnVo = new SalaryUploadParamVo();
+				returnVo.setDataNum(vo.getDataNum());
 				returnVo.setCheckList(checkList);
 				returnVo.setJsonString(jsonString);
 				returnVo.setSalaryType(excelVo.getSalaryType());