Commit d511ed7a authored by chenyuxi's avatar chenyuxi

feat: 薪酬的薪资导入——加日志

parent 26d995c7
...@@ -322,7 +322,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -322,7 +322,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
TCheckBankNo checkBankNo; TCheckBankNo checkBankNo;
for (TSalaryEmployee employee : saveNewEmpList) { for (TSalaryEmployee employee : saveNewEmpList) {
// cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号 // cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号
log.info("走到了》》》》saveNewEmployeeList"); log.error("走到了》》》》saveNewEmployeeList");
if (Common.isNotNull(employee.getBankNo()) if (Common.isNotNull(employee.getBankNo())
//&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT)) //&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
&& (Common.isEmpty(employee.getSalaryGiveTime()) && (Common.isEmpty(employee.getSalaryGiveTime())
...@@ -342,12 +342,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -342,12 +342,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
Map<String, Boolean> bankMap = new HashMap<>(); Map<String, Boolean> bankMap = new HashMap<>();
Map<String, Boolean> phoneMap = new HashMap<>(); Map<String, Boolean> phoneMap = new HashMap<>();
if (!bankList.isEmpty()) { if (!bankList.isEmpty()) {
log.info("走到了》》》》批量校验 卡号与手机号"); log.error("走到了》》》》批量校验 卡号与手机号");
R<CheckBatchVo> checkListR = HttpDaprUtil.invokeMethodPost(checkProperties.getAppUrl(), checkProperties.getAppId() R<CheckBatchVo> checkListR = HttpDaprUtil.invokeMethodPost(checkProperties.getAppUrl(), checkProperties.getAppId()
, "/tcheckbankno/inner/checkBankNoBatch", bankList, CheckBatchVo.class, SecurityConstants.FROM_IN); , "/tcheckbankno/inner/checkBankNoBatch", bankList, CheckBatchVo.class, SecurityConstants.FROM_IN);
if (checkListR != null && checkListR.getData() != null) { if (checkListR != null && checkListR.getData() != null) {
bankMap = checkListR.getData().getCheckMap(); bankMap = checkListR.getData().getCheckMap();
log.info("走到了》》》》bankMap",bankMap.toString()); log.error("走到了》》》》bankMap",bankMap.toString());
} }
} }
if (!phoneList.isEmpty()) { if (!phoneList.isEmpty()) {
...@@ -360,7 +360,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -360,7 +360,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
boolean isFalse = false; boolean isFalse = false;
for (TSalaryEmployee employee : saveNewEmpList) { for (TSalaryEmployee employee : saveNewEmpList) {
log.info("走到了》》》》代发户的新员工也校验银行卡号"); log.error("走到了》》》》代发户的新员工也校验银行卡号");
// cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号 // cyx-mvp1.7.0:调整 代发户的新员工也校验银行卡号
if (Common.isNotNull(employee.getBankNo()) if (Common.isNotNull(employee.getBankNo())
//&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT)) //&& (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))
...@@ -368,7 +368,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -368,7 +368,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
|| CommonConstants.ZERO_STRING.equals(employee.getSalaryGiveTime()) || CommonConstants.ZERO_STRING.equals(employee.getSalaryGiveTime())
|| (CommonConstants.ONE_STRING.equals(employee.getSalaryGiveTime()) && Common.isNotNull(employee.getBankNo())))) { || (CommonConstants.ONE_STRING.equals(employee.getSalaryGiveTime()) && Common.isNotNull(employee.getBankNo())))) {
if (bankMap.get(employee.getBankNo()) != null) { if (bankMap.get(employee.getBankNo()) != null) {
log.info("走到了》》》》校验银行卡号",bankMap.get(employee.getBankNo())); log.error("走到了》》》》校验银行卡号",bankMap.get(employee.getBankNo()));
if (Boolean.FALSE.equals(bankMap.get(employee.getBankNo()))) { if (Boolean.FALSE.equals(bankMap.get(employee.getBankNo()))) {
errorList.add(new ErrorMessage((employee.getLineNums() ), "第" + (employee.getLineNums() ) + "行:该员工新建失败:【姓名与卡号验证:认证不一致】")); errorList.add(new ErrorMessage((employee.getLineNums() ), "第" + (employee.getLineNums() ) + "行:该员工新建失败:【姓名与卡号验证:认证不一致】"));
isFalse = true; isFalse = true;
......
...@@ -631,10 +631,10 @@ public class SalaryAccountUtil implements Serializable { ...@@ -631,10 +631,10 @@ public class SalaryAccountUtil implements Serializable {
} }
} }
if (canSave) { if (canSave) {
log.info("走到了》》》》canSave"); log.error("走到了》》》》canSave");
// 新增 // 新增
if (!saveNewEmpList.isEmpty()) { if (!saveNewEmpList.isEmpty()) {
log.info("走到了》》》》saveNewEmpList"); log.error("走到了》》》》saveNewEmpList");
tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList); tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList);
} }
// 更新人员信息 // 更新人员信息
......
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