Commit 01248808 authored by hcing's avatar hcing

fix(tcm):监管更新个人主体信息

parent e9e6c1f2
......@@ -1215,7 +1215,7 @@ public class TzBaseEnterpriseInfoServiceImpl
return userInfoService.personalInfoUpdateById((Map<String, Object>) map.get("raw"));
}
private void updateCompanyInfo(TzBaseEnterpriseInfo tzBaseEnterpriseInfo, CompanyModel updateModel) {
public void updateCompanyInfo(TzBaseEnterpriseInfo tzBaseEnterpriseInfo, CompanyModel updateModel) {
FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.update(updateModel, updateModel.getSequenceNbr());
if (companyResult == null || companyResult.getStatus() != 200) {
log.error("更新单位错误: {}", companyResult);
......
......@@ -2439,7 +2439,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
if (!ValidationUtil.isEmpty(baseEnterpriseInfoDto)) {
individuality = individualityMapper.getIndividualityInfo(baseEnterpriseInfoDto.getSequenceNbr());
individuality.setPhone(baseEnterpriseInfoDto.getContactPhone());
individuality.setGoverningBody(baseEnterpriseInfoDto.getGoverningBody());
individuality.setGoverningBody(baseEnterpriseInfoDto.getSuperviseOrgCode() + "_" + baseEnterpriseInfoDto.getSuperviseOrgName());
individuality.setAddress(baseEnterpriseInfoDto.getAddress());
}
return individuality;
......@@ -2450,9 +2450,15 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
public TzIndividualityDto personalInfoUpdateById(Map<String, Object> map) {
TzsBaseIndividuality individuality = individualityMapper.selectById(Long.valueOf(map.get("sequenceNbr").toString()));
TzBaseEnterpriseInfo baseEnterpriseInfo = baseEnterpriseInfoService.getBaseMapper().selectById(individuality.getEnterpriseId());
String governingBody = ObjectUtils.isEmpty(map.get("governingBody")) ? null : (String) map.get("governingBody");
String[] governingBodySpilt = null;
if (governingBody != null && governingBody.split("_").length > 1) {
governingBodySpilt = governingBody.split("_");
baseEnterpriseInfo.setGoverningBody(governingBodySpilt[1]);
baseEnterpriseInfo.setSuperviseOrgCode(governingBodySpilt[0]);
baseEnterpriseInfo.setSuperviseOrgName(governingBodySpilt[1]);
}
baseEnterpriseInfo.setContactPhone(ObjectUtils.isEmpty(map.get("phone")) ? null : (String) map.get("phone"));
baseEnterpriseInfo.setGoverningBody(ObjectUtils.isEmpty(map.get("governingBody")) ? null : (String) map.get("governingBody"));
baseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("address")) ? null : (String) map.get("address"));
individuality.setRealName(ObjectUtils.isEmpty(map.get("name")) ? null : (String) map.get("name"));
individuality.setExpirationDateStart(ObjectUtils.isEmpty(map.get("expirationDateStart")) ? null : (String) map.get("expirationDateStart"));
......@@ -2467,6 +2473,18 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
TzIndividualityDto individualityDto = new TzIndividualityDto();
BeanUtils.copyProperties(individuality, individualityDto);
if (governingBodySpilt != null) {
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
tzBaseEnterpriseInfo.setSequenceNbr(individuality.getEnterpriseId());
CompanyModel updateModel = Privilege.companyClient.queryByCompanyCode(baseEnterpriseInfo.getUseCode()).getResult();
HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(baseEnterpriseInfo.getSuperviseOrgCode()).getResult();
// 目前平台返回key为compnay(存在拼写错误)
CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
updateModel.setParentId(parentModel.getSequenceNbr());// 更新单位的上下级
baseEnterpriseInfoService.updateCompanyInfo(tzBaseEnterpriseInfo, updateModel);
}
publisher.publish(new DataRefreshEvent(this, Collections.singletonList(individualityDto.getEnterpriseId() + ""), DataRefreshEvent.DataType.enterprise.name(), DataRefreshEvent.Operation.UPDATE));
return individualityDto;
}
......
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