更新

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/enums/EnterpriseEnums.java

@@ -23,7 +23,7 @@ public enum EnterpriseEnums {
 
 
 
-    public static EnterpriseEnums getEnumByCode(String type) {
+    public static EnterpriseEnums getEnumByType(String type) {
         for (EnterpriseEnums value : EnterpriseEnums.values()) {
             if (value.getType().equals(type)) {
                 return value;

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.tcm.api.dto.BaseInstitutionRegisterDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.BaseUnitLicence;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsBaseInstitution;
+import com.yeejoin.amos.boot.module.tcm.api.enums.EnterpriseEnums;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsBaseInstitutionMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzsBaseInstitutionService;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsBaseInstitutionDto;
@@ -69,24 +70,25 @@ public class TzsBaseInstitutionServiceImpl extends BaseService<TzsBaseInstitutio
 
     @Transactional
     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();
+        companyInfo.setAddress(dealNull2EmptyString(dto.getProvince())
+                + dealNull2EmptyString(dto.getCity()) + dealNull2EmptyString(dto.getDistrict())
+                + dealNull2EmptyString(dto.getStree()) + dealNull2EmptyString(dto.getCommunity())
+                + dealNull2EmptyString(dto.getAddress()));
+        companyInfo.setAgencyCode("tzs");
+        companyInfo.setParentId(Long.parseLong(dto.getManagementUnitId()));
+        companyInfo.setLevel("company");
+        companyInfo.setCompanyName(dto.getName());
+        companyInfo.setCompanyCode(dto.getUnitCode());
+        companyInfo.setContact(dto.getLegalPerson());
+        companyInfo.setCompanyType(unitType);
+        companyInfo.setLandlinePhone(dto.getLegalPersonTel());
         try {
-            dto.setUnitCodeType("1060");
-            dto.setUnitCodeTypeName("营业执照");
-            String unitType = StringUtils.join(dto.getUnitTypeList(), ",");
-            String unitTypeCode = StringUtils.join(dto.getUnitTypeCodeList(), ",");
-            CompanyModel companyInfo = new CompanyModel();
-            companyInfo.setAddress(dealNull2EmptyString(dto.getProvince())
-                    + dealNull2EmptyString(dto.getCity()) + dealNull2EmptyString(dto.getDistrict())
-                    + dealNull2EmptyString(dto.getStree()) + dealNull2EmptyString(dto.getCommunity())
-                    + dealNull2EmptyString(dto.getAddress()));
-            companyInfo.setAgencyCode("tzs");
-            companyInfo.setParentId(Long.parseLong(dto.getManagementUnitId()));
-            companyInfo.setLevel("company");
-            companyInfo.setCompanyName(dto.getName());
-            companyInfo.setCompanyCode(dto.getUnitCode());
-            companyInfo.setContact(dto.getLegalPerson());
-            companyInfo.setCompanyType(unitType);
-            companyInfo.setLandlinePhone(dto.getLegalPersonTel());
             FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.create(companyInfo);
             if (companyResult == null || companyResult.getResult() == null) {
                 throw new BadRequest("单位注册失败");
@@ -104,7 +106,7 @@ public class TzsBaseInstitutionServiceImpl extends BaseService<TzsBaseInstitutio
             dto.setAdminUserId(user.getUserId());
             RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
             BeanUtils.copyProperties(dto, regUnitInfoDto);
-            TzBaseEnterpriseInfo baseEnterpriseInfo = regUnitInfoService.createBaseEnterpriseInfo(regUnitInfoDto);
+            TzBaseEnterpriseInfo baseEnterpriseInfo = regUnitInfoService.createBaseEnterpriseInfo(regUnitInfoDto, EnterpriseEnums.SY_DW.getType());
             TzsBaseInstitution tzsBaseInstitution = new TzsBaseInstitution();
             BeanUtils.copyProperties(dto.getRegUnitIc(), tzsBaseInstitution);
             tzsBaseInstitution.setEnterpriseId(baseEnterpriseInfo.getSequenceNbr());

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

@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.tcm.api.dto.BaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.BaseUnitLicence;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tcm.api.enums.CompanyLevelEnum;
+import com.yeejoin.amos.boot.module.tcm.api.enums.EnterpriseEnums;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.biz.service.impl.BaseUnitLicenceServiceImpl;
 import com.yeejoin.amos.boot.module.tcm.biz.service.impl.EquipmentCategoryServiceImpl;
@@ -190,7 +191,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 			Bean.copyExistPropertis(model.getRegUnitIc(), regUnitIc);
 			regUnitIcService.saveOrUpdate(regUnitIc);
 			// 5.创建企业信息
-			this.createBaseEnterpriseInfo(model);
+			this.createBaseEnterpriseInfo(model, EnterpriseEnums.QY_DW.getType());
 			if (!ObjectUtils.isEmpty(regUnitInfo.getAdminName())){
 				regUnitInfo.setContactPerson(regUnitInfo.getAdminName());
 			}
@@ -308,7 +309,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 	 * 创建企业信息
 	 * @param regUnitInfo 提交对象
 	 */
-	public TzBaseEnterpriseInfo createBaseEnterpriseInfo(RegUnitInfoDto regUnitInfo) {
+	public TzBaseEnterpriseInfo createBaseEnterpriseInfo(RegUnitInfoDto regUnitInfo, String type) {
 		// 1.填充数据
 		TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
 		baseEnterpriseInfo.setUseUnitCertificate(regUnitInfo.getUnitCodeTypeName());
@@ -334,10 +335,14 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 		baseEnterpriseInfo.setSuperviseOrgName(regUnitInfo.getManagementUnit());
 		baseEnterpriseInfo.setGoverningBody(regUnitInfo.getManagementUnit());
 		baseEnterpriseInfo.setDataSources("企业注册");
-		baseEnterpriseInfo.setIndustry(regUnitInfo.getRegUnitIc().getIndustryName());
-		baseEnterpriseInfo.setRegistrationAuthority(regUnitInfo.getRegUnitIc().getRegisteredOrgan());
-		baseEnterpriseInfo.setApprovalTime(regUnitInfo.getRegUnitIc().getApprovedDate());
-		baseEnterpriseInfo.setOperatingStatus(regUnitInfo.getRegUnitIc().getBusinessState());
+		baseEnterpriseInfo.setRegisterType(Objects.requireNonNull(EnterpriseEnums.getEnumByType(type).getTypeName()));
+		if (type.equals(EnterpriseEnums.QY_DW.getType())){
+			baseEnterpriseInfo.setIndustry(regUnitInfo.getRegUnitIc().getIndustryName());
+			baseEnterpriseInfo.setRegistrationAuthority(regUnitInfo.getRegUnitIc().getRegisteredOrgan());
+			baseEnterpriseInfo.setApprovalTime(regUnitInfo.getRegUnitIc().getApprovedDate());
+			baseEnterpriseInfo.setOperatingStatus(regUnitInfo.getRegUnitIc().getBusinessState());
+		}
+		baseEnterpriseInfo.setUseUnitCode(regUnitInfo.getUnitCode());
 		baseEnterpriseInfo.setSyncDate(new Date());
 		baseEnterpriseInfo.setSyncState(0);
 		LambdaQueryWrapper<TzBaseEnterpriseInfo> wrapper = new LambdaQueryWrapper<>();