|
@@ -590,17 +590,29 @@ public class SapUserService extends BaseService {
|
|
.relation(relationship.getRelationshipType()).build();
|
|
.relation(relationship.getRelationshipType()).build();
|
|
familyList.add(family);
|
|
familyList.add(family);
|
|
}
|
|
}
|
|
|
|
+ UploadUpdateEmpDTO reqdata = UploadUpdateEmpDTO.builder().cardId(user.getCardId())
|
|
|
|
+ .cardType(CardTypeEnum.getEnumBySapCode(user.getCardType()).getMyCode()).email(user.getEmail())
|
|
|
|
+ .entryDate(user.getStartDate()).jobNumber(user.getJobNumber()).phone(user.getFormatMobile())
|
|
|
|
+ .resignDate(user.getEndDate()).type(type).username(user.getName()).familyList(familyList).build();
|
|
|
|
+
|
|
SapBank sapBank = sapBankService.selectOneByPersonId(user.getPersonId());
|
|
SapBank sapBank = sapBankService.selectOneByPersonId(user.getPersonId());
|
|
|
|
+ if (sapBank != null) {
|
|
|
|
+ reqdata.setAccountBank(sapBank.getNumber());
|
|
|
|
+ reqdata.setAccountBankName(sapBank.getBank());
|
|
|
|
+ }
|
|
SapPerGlobalInfoCHN globalInfo = globalInfoCHNService.selectOneByPersonId(user.getPersonId());
|
|
SapPerGlobalInfoCHN globalInfo = globalInfoCHNService.selectOneByPersonId(user.getPersonId());
|
|
|
|
+ if (globalInfo != null) {
|
|
|
|
+ reqdata.setSocialArea(globalInfo.getSocialSecurityLocation());
|
|
|
|
+ }
|
|
SapContract contract = contractService.selectOneByPersonId(user.getPersonId());
|
|
SapContract contract = contractService.selectOneByPersonId(user.getPersonId());
|
|
|
|
+ if (contract != null) {
|
|
|
|
+ reqdata.setLegalPerson(contract.getLegalName());
|
|
|
|
+ }
|
|
SapEmpJob empJob = empJobService.selectOneByPersonId(user.getPersonId());
|
|
SapEmpJob empJob = empJobService.selectOneByPersonId(user.getPersonId());
|
|
- UploadUpdateEmpDTO reqdata = UploadUpdateEmpDTO.builder().accountBank(sapBank.getNumber())
|
|
|
|
- .accountBankName(sapBank.getBank()).cardId(user.getCardId())
|
|
|
|
- .cardType(CardTypeEnum.getEnumBySapCode(user.getCardType()).getMyCode()).email(user.getEmail())
|
|
|
|
- .entryDate(user.getStartDate()).jobNumber(user.getJobNumber()).legalPerson(contract.getLegalName())
|
|
|
|
- .phone(user.getFormatMobile()).resignDate(user.getEndDate())
|
|
|
|
- .socialArea(globalInfo.getSocialSecurityLocation()).type(type).username(user.getName())
|
|
|
|
- .provinceName(empJob.getLocationName()).familyList(familyList).build();
|
|
|
|
|
|
+ if (empJob != null) {
|
|
|
|
+ reqdata.setProvinceName(empJob.getLocationName());
|
|
|
|
+ }
|
|
|
|
+
|
|
String url = "http://cmcadmin.info666.com/hr/emp/updateEmpInfo";
|
|
String url = "http://cmcadmin.info666.com/hr/emp/updateEmpInfo";
|
|
if (!devFlag) {
|
|
if (!devFlag) {
|
|
url = "https://manage.inet.cmcinc.cn/hr/emp/updateEmpInfo";
|
|
url = "https://manage.inet.cmcinc.cn/hr/emp/updateEmpInfo";
|