MVP1.4-导出-薪资人员导入

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

@@ -605,6 +605,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 								curTaxMonth = true;
 							} else if (Common.isNotNull(excel.getTaxMonth())) {
 								if (excel.getTaxMonth().length() == 6) {
+									try {
+										Integer.parseInt(excel.getTaxMonth());
+									} catch (NumberFormatException e) {
+										errorMessageList.add(new ErrorMessage((i + 2), "新增员工，计税月份错误"));
+										continue;
+									}
 									emp.setTaxMonth(excel.getTaxMonth());
 								} else {
 									errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.TAX_MONTH_LENGTH));
@@ -670,6 +676,17 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 							errorMessageList.add(new ErrorMessage((i + 2), "新增员工，除了支行，其他必填"));
 							continue;
 						} else {
+							if (excel.getTaxMonth().length() == 6) {
+								try {
+									Integer.parseInt(excel.getTaxMonth());
+								} catch (NumberFormatException e) {
+									errorMessageList.add(new ErrorMessage((i + 2), "新增员工，计税月份错误"));
+									continue;
+								}
+							} else {
+								errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.TAX_MONTH_LENGTH));
+								continue;
+							}
 							String pre = this.checkNewEmpBankAndPhone(excel, true);
 							if (pre != null) {
 								errorMessageList.add(new ErrorMessage((i + 2), pre));