Merge remote-tracking branch 'origin/MVP1.6.2' into MVP1.6.3

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

@@ -689,6 +689,17 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 			List<TSalaryStandardOriginalDetail> detailList = tSalaryStandardOriginalDetailService.getTSalaryStandardOriginalDetailByOrgId(originalId);
 			Map<String, TSalaryStandardOriginalDetail> detailMap = new HashMap<>();
 			for (TSalaryStandardOriginalDetail detail : detailList) {
+				if (Common.isEmpty(detail.getModelName())
+						&& ("是否新员工（默认否）".equals(detail.getExcelName())
+						|| "开户行总行".equals(detail.getExcelName())
+						|| "开户行省".equals(detail.getExcelName())
+						|| "开户行市".equals(detail.getExcelName())
+						|| "开户行支行".equals(detail.getExcelName())
+						|| "银行卡号".equals(detail.getExcelName())
+						|| "手机号码".equals(detail.getExcelName())
+						|| "计税月份".equals(detail.getExcelName()))) {
+					detail.setModelName(detail.getExcelName());
+				}
 				detailMap.put(String.valueOf(detail.getColumnNo()), detail);
 			}
 			//对前端传递的文件进行校验
@@ -724,6 +735,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 			}
 			if (vo.getTitleList() != null && !vo.getTitleList().isEmpty()) {
 				ExcelColumnVo title;
+				TSalaryStandardOriginalDetail detail;
 				for (int i = 0; i < vo.getTitleList().size(); i++) {
 					title = vo.getTitleList().get(i);
 					if (Common.isNotNull(title.getContent())) {
@@ -739,6 +751,17 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
 
 								return R.failed("未找到对应配置的表头，请核实导入的原表信息后，重新尝试！");
 								//return R.failed("表头与导入的不一致,第" + title.getLineNum() + "列表头【" + title.getContent() + "】未找到配置，请先配置表头！");
+							} else if ("是否新员工（默认否）".equals(title.getContent())
+									|| "开户行总行".equals(title.getContent())
+									|| "开户行省".equals(title.getContent())
+									|| "开户行市".equals(title.getContent())
+									|| "开户行支行".equals(title.getContent())
+									|| "银行卡号".equals(title.getContent())
+									|| "手机号码".equals(title.getContent())
+									|| "计税月份".equals(title.getContent())) {
+								detail = new TSalaryStandardOriginalDetail();
+								detail.setModelName(title.getContent());
+								detailMap.put(String.valueOf(title.getLineNum()), detail);
 							}
 						} else if (!title.getContent().equals(detailMap.get(String.valueOf(title.getLineNum())).getExcelName())
 								&& (!"是否新员工（默认否）".equals(title.getContent())

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java

@@ -146,7 +146,7 @@ public class SalaryAccountUtil implements Serializable {
 				// 基础的数据行，用于返回信息
 				int dataRow = 2;
 				if (Common.isNotNull(vo.getDataNum())) {
-					dataRow += vo.getDataNum();
+					dataRow = 1 + vo.getDataNum();
 				}
 				for (int i = 0; i < rows; i++) {
 					annualBonusFlag = false;