更新

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BaseInstitutionRegisterDto.java

@@ -111,8 +111,8 @@ public class BaseInstitutionRegisterDto extends BaseDto {
     @ApiModelProperty(value = "管理员身份证号")
     private String adminIdNumber;
 
-    @ApiModelProperty(value = "工商信息")
-    private TzsBaseInstitutionDto regUnitIc;
+    @ApiModelProperty(value = "事业单位信息")
+    private TzsBaseInstitutionDto regUnitMessage;
 
     @ApiModelProperty(value = "行政许可")
     private List<BaseUnitLicenceDto> unitLicences = new ArrayList<>();

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseEnterpriseInfoDto.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.tcm.api.entity.TzsBaseInstitution;
 import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitInfoDto;
 import io.swagger.annotations.ApiModelProperty;
@@ -301,4 +302,12 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 
 	@ApiModelProperty(value = "企业标签信息")
 	private String regulatoryLabels;
+
+	// 注册类型
+	private String registerType;
+
+	// 事业单位信息
+	private TzsBaseInstitution regUnitMessage;
+
+
 }

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

@@ -14,10 +14,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 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.TzBaseEnterpriseInfoDto;
-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.SpeUseUnit;
-import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.tcm.api.entity.*;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.IBaseUnitLicenceService;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzBaseEnterpriseInfoService;
@@ -94,6 +91,9 @@ public class TzBaseEnterpriseInfoServiceImpl
 	@Autowired
 	RegUnitInfoMapper regUnitInfoMapper;
 
+	@Autowired
+	TzsBaseInstitutionServiceImpl tzsBaseInstitutionService;
+
 	/**
 	 * 企业管理员变更缓存key前缀
 	 */
@@ -246,6 +246,10 @@ public class TzBaseEnterpriseInfoServiceImpl
 	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, String companyName) {
 		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit", companyName));
 		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = getDetail(tzBaseEnterpriseInfo);
+		LambdaQueryWrapper<TzsBaseInstitution> lambda = new QueryWrapper<TzsBaseInstitution>().lambda();
+		lambda.eq(TzsBaseInstitution::getEnterpriseId, tzBaseEnterpriseInfo.getSequenceNbr());
+		TzsBaseInstitution tzsBaseInstitution = tzsBaseInstitutionService.getBaseMapper().selectOne(lambda);
+		tzBaseEnterpriseInfoDto.setRegUnitMessage(tzsBaseInstitution);
 		ArrayList<TzBaseEnterpriseInfoDto> result = new ArrayList<>();
 		result.add(tzBaseEnterpriseInfoDto);
 		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());

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/TzsBaseInstitutionServiceImpl.java

@@ -22,6 +22,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,7 +73,6 @@ public class TzsBaseInstitutionServiceImpl extends BaseService<TzsBaseInstitutio
     public void register(BaseInstitutionRegisterDto dto) {
         dto.setUnitCodeType("1060");
         dto.setUnitCodeTypeName("营业执照");
-
         String unitType = StringUtils.join(dto.getUnitTypeList(), ",");
         String unitTypeCode = StringUtils.join(dto.getUnitTypeCodeList(), ",");
         CompanyModel companyInfo = new CompanyModel();
@@ -108,9 +108,19 @@ public class TzsBaseInstitutionServiceImpl extends BaseService<TzsBaseInstitutio
             BeanUtils.copyProperties(dto, regUnitInfoDto);
             TzBaseEnterpriseInfo baseEnterpriseInfo = regUnitInfoService.createBaseEnterpriseInfo(regUnitInfoDto, EnterpriseEnums.SY_DW.getType());
             TzsBaseInstitution tzsBaseInstitution = new TzsBaseInstitution();
-            BeanUtils.copyProperties(dto.getRegUnitIc(), tzsBaseInstitution);
+            BeanUtils.copyProperties(dto.getRegUnitMessage(), tzsBaseInstitution);
             tzsBaseInstitution.setEnterpriseId(baseEnterpriseInfo.getSequenceNbr());
             this.save(tzsBaseInstitution);
+            // 插入tz_flc_reg_unit_info
+            RegUnitInfo regUnitInfo = new RegUnitInfo();
+            Bean.copyExistPropertis(dto, regUnitInfo);
+            if (!ObjectUtils.isEmpty(regUnitInfo.getAdminName())){
+                regUnitInfo.setContactPerson(regUnitInfo.getAdminName());
+            }
+            if (!ObjectUtils.isEmpty(regUnitInfo.getAdminTel())){
+                regUnitInfo.setContactPersonTel(regUnitInfo.getAdminTel());
+            }
+            regUnitInfoService.save(regUnitInfo);
             // 3.插入单位注册许可信息表：tz_base_unit_licence
             List<BaseUnitLicence> baseUnitLicences = dto.getUnitLicences().stream().map(s -> {
                 s.setUnitCode(dto.getUnitCode());