个人主体信息编辑

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzsUserInfoService.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tcm.api.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
@@ -51,4 +52,8 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
     void testGroup(String groupSeq);
 
     void deleteGroupAndPersonRelation(String postName, String amosUserId);
+
+    TzIndividualityDto getIndividualityInfo();
+
+    TzIndividualityDto updateIndividualityInfo(TzIndividualityDto individualityDto);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsBaseIndividualityMapper.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.tcm.api.mapper.TzsBaseIndividualityMapper">
 
+    <select id="getIndividualityInfo" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto">
+        select *, real_name as name from tz_base_individuality where enterprise_id = #{enterpriseId}
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
@@ -369,5 +370,17 @@ public class TzsUserInfoController extends BaseController {
         return ResponseHelper.buildResponse(tzsUserInfoServiceImpl.screenData(result, data, id.toString()));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/individuality")
+    @ApiOperation(httpMethod = "GET", value = "获取人主体信息", notes = "获取人主体信息")
+    public ResponseModel<TzIndividualityDto> getIndividualityInfo() {
+        return ResponseHelper.buildResponse(tzsUserInfoServiceImpl.getIndividualityInfo());
+    }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/individuality")
+    @ApiOperation(httpMethod = "POST", value = "修改个人主体信息", notes = "修改个人主体信息")
+    public ResponseModel<TzIndividualityDto> updateIndividualityInfo(@RequestBody TzIndividualityDto individualityDto) {
+        return ResponseHelper.buildResponse(tzsUserInfoServiceImpl.updateIndividualityInfo(individualityDto));
+    }
 }

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

@@ -4,6 +4,7 @@ package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,9 +34,11 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -185,7 +188,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	private TzBaseEnterpriseInfoDto getDetail(TzBaseEnterpriseInfo tzBaseEnterpriseInfo){
 		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(tzBaseEnterpriseInfo.getSequenceNbr());
-		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+		RegUnitIcDto regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
 		String creditCode = tzBaseEnterpriseInfoDto.getUseCode();
 		if (tzBaseEnterpriseInfo.getRegisterType().contains(UnitTypeEnum.grzt.getName())) {
 			// 个人主体时截取证件号码（eg. 6600_210423195703287959 证件类型_证件号码）
@@ -244,6 +247,11 @@ public class TzBaseEnterpriseInfoServiceImpl
 		} else {
 			regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
 			regUnitIcDto.setIsNotAccess("0");
+			List<String> addressList = Lists.newArrayList();
+			addressList.add(tzBaseEnterpriseInfo.getProvince());
+			addressList.add(tzBaseEnterpriseInfo.getCity());
+			addressList.add(tzBaseEnterpriseInfo.getDistrict());
+			regUnitIcDto.setRegisterAddressList(addressList);
 			// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
 			tzBaseEnterpriseInfoDto.setCanEdit("1");
 		}
@@ -442,10 +450,12 @@ public class TzBaseEnterpriseInfoServiceImpl
 		return "ok";
 	}
 
+	@Transactional
 	@Override
 	public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
 		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
 		tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString()));
+		tzBaseEnterpriseInfo = tzBaseEnterpriseInfoService.getById(tzBaseEnterpriseInfo.getSequenceNbr());
 		//修改基本信息
 		tzBaseEnterpriseInfo.setEquipCategory(JSON.toJSONString(map.get("equipCategory")));
 		Map<String, String> map1 = (Map<String, String>) map.get("longitudeLatitude");
@@ -459,7 +469,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 		tzBaseEnterpriseInfo.setSuperviseOrgCode(ObjectUtils.isEmpty(map.get("superviseOrgCode")) ? null : String.valueOf(map.get("superviseOrgCode")));
 		tzBaseEnterpriseInfo.setSuperviseOrgName(ObjectUtils.isEmpty(map.get("superviseOrgName")) ? null : String.valueOf(map.get("superviseOrgName")));
 		tzBaseEnterpriseInfo.setOtherAccessories(ObjectUtils.isEmpty(map.get("otherAccessories")) ? null : JSON.toJSONString(map.get("otherAccessories")));
-		tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : JSON.toJSONString(map.get("legalPerson")));
+		tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : (String)map.get("legalPerson"));
 
 		// 修改事业单位信息
 		TzsBaseInstitutionDto baseInstitutionDto =  JSON.toJavaObject(JSON.parseObject(JSON.toJSONString(map.get("regUnitMessage"))), TzsBaseInstitutionDto.class);
@@ -467,7 +477,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 			TzsBaseInstitution baseInstitution = new TzsBaseInstitution();
 			BeanUtils.copyProperties(baseInstitutionDto, baseInstitution);
 			// 用"单位信息"更新以下字段
-			tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("address")) ? null : JSON.toJSONString(map.get("address")));
+			tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("address")) ? null : (String)map.get("address"));
 			tzBaseEnterpriseInfo.setProvince(baseInstitutionDto.getUnitAddress().get(0));
 			tzBaseEnterpriseInfo.setCity(baseInstitutionDto.getUnitAddress().get(1));
 			tzBaseEnterpriseInfo.setDistrict(baseInstitutionDto.getUnitAddress().get(2));
@@ -475,33 +485,91 @@ public class TzBaseEnterpriseInfoServiceImpl
 			tzsBaseInstitutionService.saveOrUpdate(baseInstitution);
 		}
 
+		// 修改tz_flc_reg_unit_info表信息
+		RegUnitInfo regUnitInfo;
+		LambdaQueryWrapper<RegUnitInfo> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(RegUnitInfo::getUnitCode, tzBaseEnterpriseInfo.getUseCode());
+		regUnitInfo = regUnitInfoService.getOne(queryWrapper);
+		if (ValidationUtil.isEmpty(regUnitInfo)) {
+			regUnitInfo = new RegUnitInfo();
+		}
+		regUnitInfo.setName(tzBaseEnterpriseInfo.getUseUnit());
+		regUnitInfo.setUnitCode(tzBaseEnterpriseInfo.getUseCode());
+		regUnitInfo.setManagementUnit(tzBaseEnterpriseInfo.getGoverningBody());
+//		regUnitInfo.setManagementUnitId(tzBaseEnterpriseInfo.getGoverningBody());
+		regUnitInfo.setProvince(tzBaseEnterpriseInfo.getProvince());
+		regUnitInfo.setCity(tzBaseEnterpriseInfo.getCity());
+		regUnitInfo.setDistrict(tzBaseEnterpriseInfo.getDistrict());
+		regUnitInfo.setAddress(tzBaseEnterpriseInfo.getAddress());
+		regUnitInfo.setLegalPerson(tzBaseEnterpriseInfo.getLegalPerson());
+		regUnitInfo.setContactPerson(tzBaseEnterpriseInfo.getUseContact());
+		regUnitInfoService.saveOrUpdate(regUnitInfo);
+
 		//修改工商信息
-//		RegUnitIc regUnitIc = new RegUnitIc();
-//		List<String> addressList = (List<String>) map.get("registerAddressList");
-//		tzBaseEnterpriseInfo.setProvince(addressList.get(0));
-//		tzBaseEnterpriseInfo.setCity(addressList.get(1));
-//		tzBaseEnterpriseInfo.setDistrict(addressList.get(3));
-//		tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
-//		tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("stree")) ? null : String.valueOf(map.get("stree")));
-//		tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
-//		regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
-//		regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(map.get("registeredOrgan")) ? null : String.valueOf(map.get("registeredOrgan")));
-//		Date approvedDate = new Date();
-//		try {
-//			approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
-//		} catch (ParseException e) {
-//			throw new RuntimeException(e);
-//		}
-//		regUnitIc.setBusinessState(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
-//		regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
-//		RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
-//		});
-////		regUnitIcService.update(regUnitIc, new QueryWrapper<RegUnitIc>().eq("unit_code", regUnitIcDto.getUnitCode()));
-//
-//
-//		//修改许可信息
-//		List<BaseUnitLicence> licences = (List<BaseUnitLicence>) map.get("unitLicences");
-//		baseUnitLicenceService.saveOrUpdateBatch(licences);
+		RegUnitIc regUnitIc = new RegUnitIc();
+		List<String> addressList = (List<String>) map.get("registerAddressList");
+		if (!ValidationUtil.isEmpty(addressList)) {
+			tzBaseEnterpriseInfo.setProvince(addressList.get(0));
+			tzBaseEnterpriseInfo.setCity(addressList.get(1));
+			tzBaseEnterpriseInfo.setDistrict(addressList.get(2));
+			tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
+			tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("street")) ? null : String.valueOf(map.get("street")));
+			tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("regAddress")) ? null : String.valueOf(map.get("regAddress")));
+			tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
+			regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
+			DataDictionary regOrganCodeDict = iDataDictionaryService.getByCode(String.valueOf(map.get("registeredOrganCode")),"DJJG");
+			regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(regOrganCodeDict) ? null : String.valueOf(regOrganCodeDict.getName()));
+			regUnitIc.setRegisteredOrganCode(ObjectUtils.isEmpty(map.get("registeredOrganCode")) ? null : String.valueOf(map.get("registeredOrganCode")));
+			Date approvedDate;
+			try {
+				approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
+			} catch (ParseException e) {
+				throw new RuntimeException(e);
+			}
+			regUnitIc.setBusinessStateCode(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
+			DataDictionary businessStateDict = iDataDictionaryService.getByCode(String.valueOf(map.get("businessState")),"jyzt");
+			regUnitIc.setBusinessState(ObjectUtils.isEmpty(businessStateDict) ? null : businessStateDict.getName());
+			regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
+			RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
+			});
+			regUnitIcService.update(regUnitIc, new QueryWrapper<RegUnitIc>().eq("unit_code", regUnitIcDto.getUnitCode()));
+		}
+
+		//修改许可信息
+		// 1、先删除原有许可信息
+		List<BaseUnitLicenceDto> baseUnitLicenceDtos = baseUnitLicenceService.queryForBaseUnitLicenceList(tzBaseEnterpriseInfo.getUseCode());
+		if (!ValidationUtil.isEmpty(baseUnitLicenceDtos)) {
+			List<Long> seqs = Lists.newArrayList();
+			baseUnitLicenceDtos.forEach(b -> {
+				seqs.add(b.getSequenceNbr());
+			});
+			baseUnitLicenceService.deleteBatchSeq(seqs);
+		}
+		// 2、再保存新许可信息
+		List<BaseUnitLicence> licences = Lists.newArrayList();
+		JSON.parseArray(JSON.toJSONString(map.get("unitLicences"))).forEach(obj -> {
+			BaseUnitLicence baseUnitLicence = JSON.toJavaObject((JSONObject )obj, BaseUnitLicence.class);
+			baseUnitLicence.setUnitCode(ObjectUtils.isEmpty(map.get("useCode")) ? null : (String)map.get("useCode"));
+			baseUnitLicence.setUnitName(ObjectUtils.isEmpty(map.get("useUnit")) ? null : (String)map.get("useUnit"));
+
+			// 处理许可字典值对应名称
+			List<DataDictionary> dictionaries = regUnitInfoService.initAllDataDictionaryList();
+			baseUnitLicence.setCertType(dictionaries.stream().filter(d -> d.getType().equals("UNIT_TYPE_NEW") && d.getCode().equals(baseUnitLicence.getCertTypeCode())).findFirst().get().getName());
+			baseUnitLicence.setItemCodeName(dictionaries.stream().filter(d -> !ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-") &&  d.getCode().equals(baseUnitLicence.getItemCode())).findFirst().get().getName());
+			baseUnitLicence.setSubItemName(dictionaries.stream().filter(d -> !ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-") && d.getCode().equals(baseUnitLicence.getSubItemCode())).findFirst().get().getName());
+			if (ValidationUtil.isEmpty(baseUnitLicence.getParameterCode())) {
+				baseUnitLicence.setParameter(null);
+			} else {
+				baseUnitLicence.setParameter(dictionaries.stream().filter(d -> !ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-") && d.getCode().equals(baseUnitLicence.getParameterCode())).findFirst().get().getName());
+			}
+			baseUnitLicence.setApprovedOrgan(dictionaries.stream().filter(d -> d.getType().equals("DJJG") && baseUnitLicence.getApprovedOrganCode().equals(d.getCode())).findFirst().get().getName());
+			baseUnitLicence.setApplyType(dictionaries.stream().filter(d -> d.getType().equals("xkfszt") && baseUnitLicence.getApplyTypeCode().equals(d.getCode())).findFirst().get().getName());
+			baseUnitLicence.setAppraisalType(dictionaries.stream().filter(d -> d.getType().equals("xkpsfs") && baseUnitLicence.getAppraisalTypeCode().equals(d.getCode())).findFirst().get().getName());
+
+			licences.add(baseUnitLicence);
+		});
+
+		baseUnitLicenceService.saveBatch(licences);
 		// 企业信息变更-同步修改企业下人员绑定设备类型
 		ArrayList<String> newData = new ArrayList<>();
 		JSONArray objects = JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory());

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

@@ -5,19 +5,19 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.*;
 import com.yeejoin.amos.boot.module.tcm.api.entity.*;
 import com.yeejoin.amos.boot.module.tcm.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.tcm.api.enums.PersonManageRoleEnum;
 import com.yeejoin.amos.boot.module.tcm.api.enums.TwoStipulateGroupEnum;
 import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
+import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsBaseIndividualityMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserEquipMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserInfoService;
@@ -38,6 +38,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
@@ -66,6 +67,12 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     @Autowired
     TzBaseEnterpriseInfoServiceImpl baseEnterpriseInfoService;
 
+    @Autowired
+    TzsBaseIndividualityServiceImpl individualityService;
+
+    @Autowired
+    TzsBaseIndividualityMapper individualityMapper;
+
     //企业人员角色
     private final String USER_ROLE = "QYRYJS";
     //企业人员用户组
@@ -189,7 +196,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         }
     }
 
-
     @Override
     public Map<String, Object> getDetail(Long id) {
         Map<String, Object> maps = new HashMap<>();
@@ -586,4 +592,44 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         return result;
     }
 
+    @Override
+    public TzIndividualityDto getIndividualityInfo() {
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        AgencyUserModel userModel = reginParams.getUserModel();
+        CompanyBo companyBo = reginParams.getCompany();
+        TzIndividualityDto individuality = new TzIndividualityDto();
+        TzBaseEnterpriseInfoDto baseEnterpriseInfoDto = baseEnterpriseInfoService.getInfoByUseCode(companyBo.getCompanyCode());
+        if (!ValidationUtil.isEmpty(baseEnterpriseInfoDto)) {
+            individuality = individualityMapper.getIndividualityInfo(baseEnterpriseInfoDto.getSequenceNbr());
+            individuality.setPhone(userModel.getMobile());
+            individuality.setGoverningBody(baseEnterpriseInfoDto.getGoverningBody());
+            individuality.setAddress(baseEnterpriseInfoDto.getAddress());
+        }
+        return individuality;
+    }
+
+    @Transactional
+    @Override
+    public TzIndividualityDto updateIndividualityInfo(TzIndividualityDto individualityDto) {
+        TzsBaseIndividuality individuality = new TzsBaseIndividuality();
+        TzBaseEnterpriseInfo baseEnterpriseInfo = baseEnterpriseInfoService.getById(individualityDto.getEnterpriseId());
+        if (!ValidationUtil.isEmpty(baseEnterpriseInfo)) {
+            BeanUtils.copyProperties(individualityDto, individuality);
+            // 更新tz_base_individuality信息
+            individuality.setRealName(individualityDto.getName());
+            individualityService.saveOrUpdate(individuality);
+
+            // 更新tz_base_enterprise_info信息
+            baseEnterpriseInfo.setAddress(individualityDto.getAddress());
+            baseEnterpriseInfoService.updateById(baseEnterpriseInfo);
+            // 更新privilege_agency_user手机号
+            ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+            AgencyUserModel userModel = reginParams.getUserModel();
+            if (!userModel.getMobile().equals(individualityDto.getPhone())) {
+                userModel.setMobile(individualityDto.getPhone());
+                Privilege.agencyUserClient.modifyMobile(userModel, userModel.getUserId());
+            }
+        }
+        return individualityDto;
+    }
 }

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

@@ -55,7 +55,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -1032,7 +1031,6 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 	 * @param object
 	 * @throws InterruptedException
 	 */
-	@Async
 	void updateAmosTask(String taskId, JSONObject object) throws InterruptedException {
 		Thread.sleep(1000*2);
 		FeignClientResult<JSONObject> jsonObjectFeignClientResult = idxFeignService.updateAmosTask(taskId, object);