feat(tcm): 添加个人基本信息修改功能

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -1201,7 +1201,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 	@Transactional (rollbackFor = Exception.class)
 	@Override
 	public TzIndividualityDto personalInfoUpdateById(Map<String, Object> map) {
-		return userInfoService.personalInfoUpdateById(map);
+		return userInfoService.personalInfoUpdateById((Map<String, Object>) map.get("raw"));
 	}
 
 	private void handleUnitType(Map<String, Object> map, RegUnitInfo regUnitInfo, AgencyUserModel agencyUserModel) {

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -1809,22 +1809,29 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         return individuality;
     }
 
+    @Transactional (rollbackFor = Exception.class)
     @Override
     public TzIndividualityDto personalInfoUpdateById(Map<String, Object> map) {
-        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = baseEnterpriseInfoService.getById(Long.valueOf(map.get("sequenceNbr").toString()));
-        TzIndividualityDto individuality = individualityMapper.getIndividualityInfo(tzBaseEnterpriseInfo.getSequenceNbr());
-        individuality.setPhone(ObjectUtils.isEmpty(map.get("phone")) ? null : (String) map.get("phone"));
-        individuality.setGoverningBody(ObjectUtils.isEmpty(map.get("governingBody")) ? null : (String) map.get("governingBody"));
-        individuality.setAddress(ObjectUtils.isEmpty(map.get("address")) ? null : (String) map.get("address"));
+        TzsBaseIndividuality individuality = individualityMapper.selectById(Long.valueOf(map.get("sequenceNbr").toString()));
+        TzBaseEnterpriseInfo baseEnterpriseInfo = baseEnterpriseInfoService.getBaseMapper().selectById(individuality.getEnterpriseId());
+
+        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"));
         individuality.setExpirationDateEnd(ObjectUtils.isEmpty(map.get("expirationDateEnd")) ? null : (String) map.get("expirationDateEnd"));
         individuality.setCredentialsNum(ObjectUtils.isEmpty(map.get("credentialsNum")) ? null : (String) map.get("credentialsNum"));
         individuality.setCredentialsType(ObjectUtils.isEmpty(map.get("credentialsType")) ? null : (String) map.get("credentialsType"));
-        individuality.setIdentificationPhoto(ObjectUtils.isEmpty(map.get("identificationPhoto")) ? null : (String) map.get("identificationPhoto"));
-        individuality.setName(ObjectUtils.isEmpty(map.get("name")) ? null : (String) map.get("name"));
+        individuality.setIdentificationPhoto(ObjectUtils.isEmpty(map.get("identificationPhoto")) ? null : JSON.toJSONString(map.get("identificationPhoto")));
         individuality.setExpirationDateType(ObjectUtils.isEmpty(map.get("expirationDateType")) ? null : (String) map.get("expirationDateType"));
-        individualityMapper.updateById(Bean.toPo(individuality, new TzsBaseIndividuality()));
-        return individuality;
+
+        individualityMapper.updateById(individuality);
+        baseEnterpriseInfoService.updateById(baseEnterpriseInfo);
+
+        TzIndividualityDto individualityDto = new TzIndividualityDto();
+        BeanUtils.copyProperties(individuality, individualityDto);
+        return individualityDto;
     }
 
     private void syncNewPost(TzsUserInfoDto tzsUserInfoDto) {