Commit 77c5206a authored by yangyang's avatar yangyang

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

- 在 ITzBaseEnterpriseInfoService 和 ITzsUserInfoService接口中添加 personalInfoUpdateById 方法 - 在 TzBaseEnterpriseInfoController 中添加 personalInfoUpdateById 控制器方法 - 在 TzBaseEnterpriseInfoServiceImpl 和 TzsUserInfoServiceImpl 中实现 personalInfoUpdateById 方法 - 新增个人基本信息修改相关的 DTO 和 Mapper 方法
parent af9aa706
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto; import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto; import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto;
import com.yeejoin.amos.boot.module.tcm.api.entity.BaseUnitLicence; import com.yeejoin.amos.boot.module.tcm.api.entity.BaseUnitLicence;
import com.yeejoin.amos.boot.module.tcm.api.entity.PageParam; import com.yeejoin.amos.boot.module.tcm.api.entity.PageParam;
import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo; import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
...@@ -56,4 +57,6 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI ...@@ -56,4 +57,6 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
TzBaseEnterpriseInfoDto updateCompanyInfoById(Map<String, Object> map, ReginParams selectedOrgInfo); TzBaseEnterpriseInfoDto updateCompanyInfoById(Map<String, Object> map, ReginParams selectedOrgInfo);
TzIndividualityDto personalInfoUpdateById(Map<String, Object> map);
} }
...@@ -92,4 +92,6 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> { ...@@ -92,4 +92,6 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
List<DataDictionary> subPostByUnitType(CompanyBo company, String parentCode); List<DataDictionary> subPostByUnitType(CompanyBo company, String parentCode);
TzIndividualityDto individualityByCompanyCode(String companyCode); TzIndividualityDto individualityByCompanyCode(String companyCode);
TzIndividualityDto personalInfoUpdateById(Map<String, Object> map);
} }
...@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils; ...@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto; import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto; import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto;
import com.yeejoin.amos.boot.module.tcm.api.entity.BaseUnitLicence; import com.yeejoin.amos.boot.module.tcm.api.entity.BaseUnitLicence;
import com.yeejoin.amos.boot.module.tcm.api.entity.PageParam; import com.yeejoin.amos.boot.module.tcm.api.entity.PageParam;
import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo; import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
...@@ -311,4 +312,11 @@ public class TzBaseEnterpriseInfoController extends BaseController { ...@@ -311,4 +312,11 @@ public class TzBaseEnterpriseInfoController extends BaseController {
public ResponseModel<TzBaseEnterpriseInfoDto> companyInfoUpdateById(@RequestBody Map<String, Object> map) { public ResponseModel<TzBaseEnterpriseInfoDto> companyInfoUpdateById(@RequestBody Map<String, Object> map) {
return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.updateCompanyInfoById(map, getSelectedOrgInfo())); return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.updateCompanyInfoById(map, getSelectedOrgInfo()));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/personalInfoUpdateById", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "根据ID修改企业信息", notes = "根据ID修改企业信息")
public ResponseModel<TzIndividualityDto> personalInfoUpdateById(@RequestBody Map<String, Object> map) {
return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.personalInfoUpdateById(map));
}
} }
...@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.UserPermissionDto; ...@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.UserPermissionDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.BaseUnitLicenceDto; import com.yeejoin.amos.boot.module.tcm.api.dto.BaseUnitLicenceDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto; import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto; import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsBaseInstitutionDto; import com.yeejoin.amos.boot.module.tcm.api.dto.TzsBaseInstitutionDto;
import com.yeejoin.amos.boot.module.tcm.api.entity.*; import com.yeejoin.amos.boot.module.tcm.api.entity.*;
import com.yeejoin.amos.boot.module.tcm.api.enums.EnterpriseEnums; import com.yeejoin.amos.boot.module.tcm.api.enums.EnterpriseEnums;
...@@ -1197,6 +1198,12 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -1197,6 +1198,12 @@ public class TzBaseEnterpriseInfoServiceImpl
} }
} }
@Transactional (rollbackFor = Exception.class)
@Override
public TzIndividualityDto personalInfoUpdateById(Map<String, Object> map) {
return userInfoService.personalInfoUpdateById(map);
}
private void handleUnitType(Map<String, Object> map, RegUnitInfo regUnitInfo, AgencyUserModel agencyUserModel) { private void handleUnitType(Map<String, Object> map, RegUnitInfo regUnitInfo, AgencyUserModel agencyUserModel) {
Object unitTypeCodesObj = map.get("unitTypeCodes"); Object unitTypeCodesObj = map.get("unitTypeCodes");
if (!(unitTypeCodesObj instanceof List<?>)) { if (!(unitTypeCodesObj instanceof List<?>)) {
......
...@@ -59,6 +59,7 @@ import org.springframework.util.CollectionUtils; ...@@ -59,6 +59,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
...@@ -1808,6 +1809,24 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -1808,6 +1809,24 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
return individuality; return individuality;
} }
@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"));
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.setExpirationDateType(ObjectUtils.isEmpty(map.get("expirationDateType")) ? null : (String) map.get("expirationDateType"));
individualityMapper.updateById(Bean.toPo(individuality, new TzsBaseIndividuality()));
return individuality;
}
private void syncNewPost(TzsUserInfoDto tzsUserInfoDto) { private void syncNewPost(TzsUserInfoDto tzsUserInfoDto) {
System.out.println(tzsUserInfoDto); System.out.println(tzsUserInfoDto);
// tzs_user_info; // tzs_user_info;
......
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