Commit 79047829 authored by hongguangwu's avatar hongguangwu

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

parents 23c778f2 56bfa3ed
...@@ -59,10 +59,10 @@ public class EkpInsuranceUtil { ...@@ -59,10 +59,10 @@ public class EkpInsuranceUtil {
//必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果 //必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果
HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers); HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers);
//有返回值的情况 VO可以替换成具体的JavaBean //有返回值的情况 VO可以替换成具体的JavaBean
log.error("推送EKP开始,formValues:"+formValues); log.info("推送EKP开始,formValues:"+formValues);
ResponseEntity<String> obj = yourRestTemplate.exchange(ekpInsuranceProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class); ResponseEntity<String> obj = yourRestTemplate.exchange(ekpInsuranceProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class);
String body = obj.getBody(); String body = obj.getBody();
log.error("推送EKP结果,body:"+body); log.info("推送EKP结果,body:"+body);
if (StringUtils.isBlank(body)){ if (StringUtils.isBlank(body)){
log.error("交易失败:"+obj); log.error("交易失败:"+obj);
return null; return null;
...@@ -84,7 +84,7 @@ public class EkpInsuranceUtil { ...@@ -84,7 +84,7 @@ public class EkpInsuranceUtil {
* @return {@link String} * @return {@link String}
*/ */
public String sendUpdateToEkp(EkpUpdateParam param){ public String sendUpdateToEkp(EkpUpdateParam param){
log.error("推送EKP开始--商险修改"); log.info("推送EKP开始--商险修改");
RestTemplate yourRestTemplate = new RestTemplate(); RestTemplate yourRestTemplate = new RestTemplate();
try{ try{
String formValues = new ObjectMapper().writeValueAsString(param); String formValues = new ObjectMapper().writeValueAsString(param);
...@@ -107,7 +107,7 @@ public class EkpInsuranceUtil { ...@@ -107,7 +107,7 @@ public class EkpInsuranceUtil {
//有返回值的情况 VO可以替换成具体的JavaBean //有返回值的情况 VO可以替换成具体的JavaBean
ResponseEntity<String> obj = yourRestTemplate.exchange(ekpInsuranceProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class); ResponseEntity<String> obj = yourRestTemplate.exchange(ekpInsuranceProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class);
String body = obj.getBody(); String body = obj.getBody();
log.error("推送EKP结果,body:"+body); log.info("推送EKP结果,body:"+body);
if (StringUtils.isBlank(body)){ if (StringUtils.isBlank(body)){
log.error(EkpConstants.SEND_FAILED); log.error(EkpConstants.SEND_FAILED);
return null; return null;
......
...@@ -570,7 +570,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -570,7 +570,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
} }
// 银行卡 // 银行卡
// 代发户的,不校验卡号,下次使用的时候校验卡号 // 代发户的,不校验卡号,下次使用的时候校验卡号
// todo cyx-mvp1.7.0: 本次是代发户,是新员工,也要要校验银行卡(但是薪酬导入类型是劳务费才会走到这里) // cyx-mvp1.7.0: 本次是代发户,是新员工,也要要校验银行卡(但是薪酬导入类型是劳务费才会走到这里)
if (Common.isNotNull(employee.getBankNo())) { if (Common.isNotNull(employee.getBankNo())) {
//if (Common.isNotNull(employee.getBankNo()) && (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))) { //if (Common.isNotNull(employee.getBankNo()) && (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))) {
// 调用校验服务 // 调用校验服务
......
...@@ -278,9 +278,8 @@ public class SalaryAccountUtil implements Serializable { ...@@ -278,9 +278,8 @@ public class SalaryAccountUtil implements Serializable {
newEmp.setEmpName(empName); newEmp.setEmpName(empName);
} }
// todo cyx-mvp1.7.0修复:去掉重复判断 // cyx-mvp1.7.0修复:去掉重复判断
if ((SalaryConstants.IF_NEW_EMPLOYEE.equals(dbFiedName) || SalaryConstants.IS_NEW_EMPLOYEE.equals(dbFiedName)) if (SalaryConstants.IF_NEW_EMPLOYEE.equals(dbFiedName) && SalaryConstants.IS_NEW.equals(cellValueStr)) {
&& SalaryConstants.IS_NEW.equals(cellValueStr)) {
isNewEmployee = true; isNewEmployee = true;
entity.setIsNewEmployee(CommonConstants.ONE_STRING); entity.setIsNewEmployee(CommonConstants.ONE_STRING);
} }
...@@ -632,13 +631,11 @@ public class SalaryAccountUtil implements Serializable { ...@@ -632,13 +631,11 @@ public class SalaryAccountUtil implements Serializable {
} }
if (canSave) { if (canSave) {
log.error("走到了》》》》canSave"); log.error("走到了》》》》canSave");
log.error("走到了》》》》saveNewEmpList>>>{}",saveNewEmpList.toString());
// 新增 // 新增
if (!saveNewEmpList.isEmpty()) { if (!saveNewEmpList.isEmpty()) {
log.error("走到了》》》》saveNewEmpList"); log.error("走到了》》》》saveNewEmpList");
tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList); tSalaryEmployeeService.saveNewEmployeeList(saveNewEmpList, errorList);
} }
log.error("走到了》》》》updateEmpBankList>>>{}",updateEmpBankList.toString());
// 更新人员信息 // 更新人员信息
if (!updateEmpBankList.isEmpty()) { if (!updateEmpBankList.isEmpty()) {
log.error("走到了》》》》updateEmpBankList"); log.error("走到了》》》》updateEmpBankList");
......
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