企业类型方法获取统一信用代码时优化处理个人类型企业

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

@@ -19,8 +19,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
@@ -38,17 +36,15 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
-import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.model.*;
-import fr.opensagres.xdocreport.core.io.IOUtils;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,8 +55,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -71,8 +65,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.*;
 import java.util.function.Function;
@@ -979,7 +971,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             return result;
         }
         CompanyModel currentCompany = companyModels.get(0);
-        result.put("creditCode", currentCompany.getCompanyCode());
+        result.put("creditCode", currentCompany.getCompanyCode().contains("_") ? currentCompany.getCompanyCode().split("_")[1] : currentCompany.getCompanyCode());
         String companyLevel = CompanyTypeEnum.decideCompanyLevel(currentCompany.getCompanyType());
         String companyType = CompanyTypeEnum.decideCompanyCode(currentCompany.getCompanyType());
         String companyTypeName = CompanyTypeEnum.decideCompanyType(currentCompany.getCompanyType());