Skip to content

Y
yifu-mvp
Commit 52bdd98d authored by hongguangwu's avatar hongguangwu
Browse files
Options

MVP1.6.2- + 极限行

parent 283f9107
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @ 52bdd98d
......@@ -357,21 +357,21 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
|| (CommonConstants.ONE_STRING.equals(employee.getSalaryGiveTime()) && Common.isNotNull(employee.getBankNo())))) {
if (bankMap.get(employee.getBankNo()) != null) {
if (Boolean.FALSE.equals(bankMap.get(employee.getBankNo()))) {
errorList.add(new ErrorMessage((employee.getLineNums() + 2), "第" + (employee.getLineNums() + 2) + "行：该员工新建失败：【姓名与卡号验证：认证不一致】"));
errorList.add(new ErrorMessage((employee.getLineNums() ), "第" + (employee.getLineNums() ) + "行：该员工新建失败：【姓名与卡号验证：认证不一致】"));
isFalse = true;
}
} else {
errorList.add(new ErrorMessage((employee.getLineNums() + 2), "第" + (employee.getLineNums() + 2) + "行：该员工新建失败：【姓名与卡号验证：" + SalaryConstants.CHECK_NO_RESPONSE + "】"));
errorList.add(new ErrorMessage((employee.getLineNums() ), "第" + (employee.getLineNums() ) + "行：该员工新建失败：【姓名与卡号验证：" + SalaryConstants.CHECK_NO_RESPONSE + "】"));
isFalse = true;
}
}
if (phoneMap.get(employee.getEmpPhone()) != null) {
if (Boolean.FALSE.equals(phoneMap.get(employee.getEmpPhone()))) {
errorList.add(new ErrorMessage((employee.getLineNums() + 2), "第" + (employee.getLineNums() + 2) + "行：该员工新建失败：【手机号验证：手机号错误】"));
errorList.add(new ErrorMessage((employee.getLineNums() ), "第" + (employee.getLineNums() ) + "行：该员工新建失败：【手机号验证：手机号错误】"));
isFalse = true;
}
} else {
errorList.add(new ErrorMessage((employee.getLineNums() + 2), "第" + (employee.getLineNums() + 2) + "行：该员工新建失败：【手机号验证：" + SalaryConstants.CHECK_NO_RESPONSE + "】"));
errorList.add(new ErrorMessage((employee.getLineNums() ), "第" + (employee.getLineNums() ) + "行：该员工新建失败：【手机号验证：" + SalaryConstants.CHECK_NO_RESPONSE + "】"));
isFalse = true;
}
}
......@@ -710,7 +710,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
for (TSalaryEmployee employee : empList) {
employee.setIssueStatus(CommonConstants.ZERO_INT);
if (bankMap.get(employee.getBankNo()) != null && Boolean.FALSE.equals(bankMap.get(employee.getBankNo()))) {
errorList.add(new ErrorMessage((employee.getLineNums() + 2), "第" + (employee.getLineNums() + 2)
errorList.add(new ErrorMessage((employee.getLineNums() ), "第" + (employee.getLineNums() )
+ "行：-上次代发户未校验【姓名与卡号】，本次校验结果：不匹配。请去薪酬人员查询处更新卡号信息！"));
return false;
}
......@@ -776,18 +776,18 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
try {
Integer.parseInt(excel.getTaxMonth());
} catch (NumberFormatException e) {
errorMessageList.add(new ErrorMessage((i + 2), "新增员工，计税月份错误"));
errorMessageList.add(new ErrorMessage((i ), "新增员工，计税月份错误"));
continue;
}
emp.setTaxMonth(excel.getTaxMonth());
} else {
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.TAX_MONTH_LENGTH));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.TAX_MONTH_LENGTH));
continue;
}
}
if (Common.isNotNull(excel.getBankName())) {
if (bankMap.get(excel.getBankName()) == null) {
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.BANK_NAME_ERROR));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.BANK_NAME_ERROR));
continue;
}
emp.setBankName(excel.getBankName());
......@@ -805,12 +805,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
if (Common.isNotNull(areaCity)) {
emp.setBankCity(areaCity);
} else {
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.CITY_ERROR));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.CITY_ERROR));
continue;
}
}
} else {
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.PROVINCE_ERROR));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.PROVINCE_ERROR));
continue;
}
}
......@@ -833,7 +833,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
if (Common.isNotNull(excel.getBankNo())) {
checkBankNo = new TCheckBankNo();
emp.setLineNums((i + 2));
emp.setLineNums((i ));
checkBankNo.setName(excel.getEmpName());
checkBankNo.setBankNo(excel.getBankNo());
bankList.add(checkBankNo);
......@@ -841,12 +841,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
updateList.add(emp);
if (curTaxMonth) {
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.CUR_TAX_INFO));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.CUR_TAX_INFO));
} else {
errorMessageList.add(new ErrorMessage((i + 2), CommonConstants.SAVE_SUCCESS));
errorMessageList.add(new ErrorMessage((i ), CommonConstants.SAVE_SUCCESS));
}
} else {
errorMessageList.add(new ErrorMessage((i + 2), "已存在，不可更新"));
errorMessageList.add(new ErrorMessage((i ), "已存在，不可更新"));
}
} else {
// 新增人员
......@@ -854,27 +854,27 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
|| Common.isEmpty(excel.getEmpPhone()) || Common.isEmpty(excel.getBankName())
|| Common.isEmpty(excel.getBankNo()) || Common.isEmpty(excel.getBankProvince())
|| Common.isEmpty(excel.getBankCity()) || Common.isEmpty(excel.getTaxMonth())) {
errorMessageList.add(new ErrorMessage((i + 2), "新增员工，除了支行，其他必填"));
errorMessageList.add(new ErrorMessage((i ), "新增员工，除了支行，其他必填"));
continue;
} else {
if (excel.getTaxMonth().length() == 6) {
try {
Integer.parseInt(excel.getTaxMonth());
} catch (NumberFormatException e) {
errorMessageList.add(new ErrorMessage((i + 2), "新增员工，计税月份错误"));
errorMessageList.add(new ErrorMessage((i ), "新增员工，计税月份错误"));
continue;
}
} else {
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.TAX_MONTH_LENGTH));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.TAX_MONTH_LENGTH));
continue;
}
if (bankMap.get(excel.getBankName()) == null) {
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.BANK_NAME_ERROR));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.BANK_NAME_ERROR));
continue;
}
String pre = this.checkNewEmpBankAndPhone(excel, true);
if (pre != null) {
errorMessageList.add(new ErrorMessage((i + 2), pre));
errorMessageList.add(new ErrorMessage((i ), pre));
continue;
} else {
areaProvince = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getBankProvince().trim());
......@@ -885,11 +885,11 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
if (Common.isNotNull(areaCity)) {
excel.setBankCity(areaCity);
} else {
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.CITY_ERROR));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.CITY_ERROR));
continue;
}
} else {
errorMessageList.add(new ErrorMessage((i + 2), SalaryConstants.PROVINCE_ERROR));
errorMessageList.add(new ErrorMessage((i ), SalaryConstants.PROVINCE_ERROR));
continue;
}
excel.setUnitId(dept.getCustomerId());
......@@ -901,13 +901,13 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
excel.setInvoiceTitle(dept.getInvoiceTitleSalary());
if (Common.isNotNull(excel.getBankNo())) {
checkBankNo = new TCheckBankNo();
excel.setLineNums((i + 2));
excel.setLineNums((i ));
checkBankNo.setName(excel.getEmpName());
checkBankNo.setBankNo(excel.getBankNo());
bankList.add(checkBankNo);
}
saveList.add(excel);
errorMessageList.add(new ErrorMessage((i + 2), CommonConstants.SAVE_SUCCESS));
errorMessageList.add(new ErrorMessage((i ), CommonConstants.SAVE_SUCCESS));
}
}
}
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @ 52bdd98d
......@@ -190,7 +190,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
// 空白列数（一旦数量达到 maxNullColumNum，将停止循环列，并删除title list与content）
int nullColumnNum = 0;
// 极限空白列，超过阈值，将不继续循环列
int maxNullColumNum = 10;
int maxNullColumNum = 30;
String idCardValue = null;
// 数据行是否被确认，true否
boolean dataRowFlag;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment