Skip to content

Y
yifu-mvp
Commit b4d490da authored by huyuchen's avatar huyuchen
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.5.1' into MVP1.5.1

parents 0b4b7931 523ffe01
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 22 deletions
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @ b4d490da
...@@ -457,6 +457,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -457,6 +457,7 @@ public class SalaryAccountUtil implements Serializable {
TSalaryEmployee otherEmp; TSalaryEmployee otherEmp;
List<TSalaryEmployee> saveNewEmpList = new ArrayList<>(); List<TSalaryEmployee> saveNewEmpList = new ArrayList<>();
List<String> checkTaxMonthList = new ArrayList<>(); List<String> checkTaxMonthList = new ArrayList<>();
boolean isContinue = true;
if (!newEmpList.isEmpty()) { if (!newEmpList.isEmpty()) {
TSalaryEmployee newEmps; TSalaryEmployee newEmps;
for (int i = 0; i < newEmpList.size(); i++) { for (int i = 0; i < newEmpList.size(); i++) {
...@@ -489,34 +490,38 @@ public class SalaryAccountUtil implements Serializable { ...@@ -489,34 +490,38 @@ public class SalaryAccountUtil implements Serializable {
, CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime()) , CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime())
, CommonConstants.ONE_STRING.equals(entity.getIsNewEmployee()) , CommonConstants.ONE_STRING.equals(entity.getIsNewEmployee())
, otherEmp.getEmpName(), entity.getSalaryStyle() , otherEmp.getEmpName(), entity.getSalaryStyle()
, nowMonth, updateEmpList, checkBankInfoEmpList, newEmps.getLineNums())) return; , nowMonth, updateEmpList, checkBankInfoEmpList, newEmps.getLineNums())) {
isContinue = false;
}
} }
} }
} }
int nowYear = Integer.parseInt(nowMonth.substring(0, 4)); if (isContinue) {
Map<String, String> minTaxMonthMap = tSalaryAccountService.getMinTaxMonthByNowYearAndList(checkTaxMonthList, nowYear); int nowYear = Integer.parseInt(nowMonth.substring(0, 4));
String minTaxMonth; Map<String, String> minTaxMonthMap = tSalaryAccountService.getMinTaxMonthByNowYearAndList(checkTaxMonthList, nowYear);
boolean canSave = true; String minTaxMonth;
if (!saveNewEmpList.isEmpty()) { boolean canSave = true;
TSalaryEmployee saveNewEmp; if (!saveNewEmpList.isEmpty()) {
for (int i = 0; i < saveNewEmpList.size(); i++) { TSalaryEmployee saveNewEmp;
saveNewEmp = saveNewEmpList.get(i); for (int i = 0; i < saveNewEmpList.size(); i++) {
// 新员工校验计税月 saveNewEmp = saveNewEmpList.get(i);
if (!"3".equals(salaryType) && !"4".equals(salaryType)) { // 新员工校验计税月
entity = entityMap.get(saveNewEmp.getEmpIdcard()); if (!"3".equals(salaryType) && !"4".equals(salaryType)) {
minTaxMonth = minTaxMonthMap.get(saveNewEmp.getEmpIdcard()); entity = entityMap.get(saveNewEmp.getEmpIdcard());
if (Common.isNotNull(minTaxMonth) minTaxMonth = minTaxMonthMap.get(saveNewEmp.getEmpIdcard());
&& !minTaxMonth.equals(entity.getTaxMonth())) { if (Common.isNotNull(minTaxMonth)
error = "第" + (saveNewEmp.getLineNums() + 2) + "行：该员工已有发薪记录，计税月份请填写：【" + minTaxMonth + "】" + "，你填写了计税月：【" + entity.getTaxMonth() + "】"; && !minTaxMonth.equals(entity.getTaxMonth())) {
errorList.add(new ErrorMessage((saveNewEmp.getLineNums() + 2), error)); error = "第" + (saveNewEmp.getLineNums() + 2) + "行：该员工已有发薪记录，计税月份请填写：【" + minTaxMonth + "】" + "，你填写了计税月：【" + entity.getTaxMonth() + "】";
canSave = false; errorList.add(new ErrorMessage((saveNewEmp.getLineNums() + 2), error));
canSave = false;
}
} }
} }
} }
} if (canSave) {
if (canSave) { // 新增
// 新增 tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList);
tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList); }
} }
} }
} catch (Exception e) { } catch (Exception e) {
......
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