Commit a7c51230 authored by tangwei's avatar tangwei

解决冲突

parents 910e73c3 49627b03
...@@ -54,10 +54,10 @@ public class PersonBasicController extends BaseController { ...@@ -54,10 +54,10 @@ public class PersonBasicController extends BaseController {
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}") @PutMapping(value = "/update")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新人员基本信息", notes = "根据sequenceNbr更新人员基本信息") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新人员基本信息", notes = "根据sequenceNbr更新人员基本信息")
public ResponseModel<PersonDto> updateBySequenceNbrPersonBasic(@RequestBody PersonDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr,HttpServletRequest httpServletRequest) { public ResponseModel<PersonDto> updateBySequenceNbrPersonBasic(@RequestBody PersonDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr,HttpServletRequest httpServletRequest) {
return ResponseHelper.buildResponse(personBasicServiceImpl.updatePerson(model,httpServletRequest)); return ResponseHelper.buildResponse(personBasicServiceImpl.updatePerson(model,httpServletRequest,sequenceNbr));
} }
/** /**
......
...@@ -152,7 +152,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -152,7 +152,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
@Transactional @Transactional
public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest) { public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest,Long sequenceNbr) {
String appKey = httpServletRequest.getHeader("appKey"); String appKey = httpServletRequest.getHeader("appKey");
String product = httpServletRequest.getHeader("product"); String product = httpServletRequest.getHeader("product");
String token = httpServletRequest.getHeader("token"); String token = httpServletRequest.getHeader("token");
...@@ -203,6 +203,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -203,6 +203,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
//人员基础信息 //人员基础信息
PersonBasic personBasic = new PersonBasic(); PersonBasic personBasic = new PersonBasic();
personBasic.setSequenceNbr(sequenceNbr);
BeanUtils.copyProperties(personUser, personBasic); BeanUtils.copyProperties(personUser, personBasic);
if(departmentModel!=null){ if(departmentModel!=null){
personBasic.setOrgCode(departmentModel.getOrgCode()); personBasic.setOrgCode(departmentModel.getOrgCode());
...@@ -213,17 +214,18 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -213,17 +214,18 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
//人员归属信息 //人员归属信息
PersonAscription personAscription = new PersonAscription(); PersonAscription personAscription = new PersonAscription();
BeanUtils.copyProperties(personUser, personAscription); BeanUtils.copyProperties(personUser, personAscription);
personAscriptionService.updateById(personAscription);
personAscription.setDepartmentName(departmentModel.getDepartmentName()); personAscription.setDepartmentName(departmentModel.getDepartmentName());
personAscription.setProjectName(companyModel.getCompanyName()); personAscription.setProjectName(companyModel.getCompanyName());
personAscriptionService.saveOrUpdate(personAscription); personAscriptionService.saveOrUpdate(personAscription);
//人员归属信息 //人员归属信息
PersonSkillEducation personSkillEducation = new PersonSkillEducation(); PersonSkillEducation personSkillEducation = new PersonSkillEducation();
BeanUtils.copyProperties(personUser, personSkillEducation); BeanUtils.copyProperties(personUser, personSkillEducation);
personSkillEducationService.saveOrUpdate(personSkillEducation); personSkillEducationService.updateById(personSkillEducation);
//人员资质信息 //人员资质信息
personCertificateService.saveOrUpdate(personCertificate); personCertificateService.updateById(personCertificate);
//人员账号信息 //人员账号信息
personAccountService.saveOrUpdate(personAccount); personAccountService.updateById(personAccount);
return model; return model;
} }
......
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