Commit fff6a014 authored by hcing's avatar hcing

feat(tcm): 人员详情返回所在单位的企业所在地

parent f70b3393
...@@ -181,6 +181,9 @@ public class TzsUserInfoVo { ...@@ -181,6 +181,9 @@ public class TzsUserInfoVo {
@ApiModelProperty(value = "养老保险证明") @ApiModelProperty(value = "养老保险证明")
private List<?> pensionInsurance; private List<?> pensionInsurance;
@TableField(value = "检验人员证书") @ApiModelProperty(value = "检验人员证书")
private List<?> inspectorCert; private List<?> inspectorCert;
@ApiModelProperty(value = "企业属于省内还是省外")
private String dataSources;
} }
...@@ -356,6 +356,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -356,6 +356,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
} else { } else {
unitTypeAllPostCode = this.getAllUserType().stream().map(DataDictionary::getCode).collect(Collectors.toList()); unitTypeAllPostCode = this.getAllUserType().stream().map(DataDictionary::getCode).collect(Collectors.toList());
} }
TzBaseEnterpriseInfo enterpriseInfo = baseEnterpriseInfoService.lambdaQuery()
.eq(TzBaseEnterpriseInfo::getUseCode, reginParams.getCompany().getCompanyCode())
.one();
Map<String, Object> maps = new HashMap<>(); Map<String, Object> maps = new HashMap<>();
TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(id); TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(id);
TzsUserInfoVo tzsUserInfoVo = new TzsUserInfoVo(); TzsUserInfoVo tzsUserInfoVo = new TzsUserInfoVo();
...@@ -401,6 +404,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -401,6 +404,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
tzsUserInfoVo.setPowerAttorney(ObjectUtils.isEmpty(tzsUserInfo.getPowerAttorney()) ? null : JSON.parseArray(tzsUserInfo.getPowerAttorney())); tzsUserInfoVo.setPowerAttorney(ObjectUtils.isEmpty(tzsUserInfo.getPowerAttorney()) ? null : JSON.parseArray(tzsUserInfo.getPowerAttorney()));
tzsUserInfoVo.setPensionInsurance(ObjectUtils.isEmpty(tzsUserInfo.getPensionInsurance()) ? null : JSON.parseArray(tzsUserInfo.getPensionInsurance())); tzsUserInfoVo.setPensionInsurance(ObjectUtils.isEmpty(tzsUserInfo.getPensionInsurance()) ? null : JSON.parseArray(tzsUserInfo.getPensionInsurance()));
tzsUserInfoVo.setInspectorCert(ObjectUtils.isEmpty(tzsUserInfo.getInspectorCert()) ? null : JSON.parseArray(tzsUserInfo.getInspectorCert())); tzsUserInfoVo.setInspectorCert(ObjectUtils.isEmpty(tzsUserInfo.getInspectorCert()) ? null : JSON.parseArray(tzsUserInfo.getInspectorCert()));
tzsUserInfoVo.setDataSources(enterpriseInfo.getDataSources());
String companyType = getUnitType(); String companyType = getUnitType();
tzsUserInfoVo.setCompanyType(companyType.contains("个人主体") ? "individual" : "no-individual"); tzsUserInfoVo.setCompanyType(companyType.contains("个人主体") ? "individual" : "no-individual");
Map<String, Object> userInfoMap = BeanUtil.beanToMap(tzsUserInfoVo); Map<String, Object> userInfoMap = BeanUtil.beanToMap(tzsUserInfoVo);
......
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