1.更名变更适配支持个人

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

@@ -112,8 +112,13 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     @Autowired
     private RedissonClient redissonClient;
 
+    @Autowired
+    TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
+
     private static String template = "来自企业（%s）的业务办理，【申请单号：%s】";
 
+    public static String  JG_COMAPNY_TYPE = "监管机构";
+
 
     @Transactional(rollbackFor = Exception.class)
     public List<JgChangeRegistrationName> save2(String submitType, JSONObject requestParam) {
@@ -741,10 +746,18 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         if (!Objects.isNull(sequenceNbr)) {
             jgChangeRegistrationName = this.baseMapper.selectById(sequenceNbr);
             jgChangeRegistrationName.setReceiveOrgCode(jgChangeRegistrationName.getReceiveCompanyCode() + "_" + jgChangeRegistrationName.getReceiveOrgName());
+            // 页面可编辑（当前登录人是发起人）且符合这个 监管机构 false
+            if(!JG_COMAPNY_TYPE.equals(reginParams.getCompany().getCompanyType())){
+                dtoMap.put("isInProvince", this.justIsInProvince(reginParams.getCompany().getCompanyCode()));
+            } else {
+                dtoMap.put("isInProvince", false);
+            }
         } else {
             jgChangeRegistrationName.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgChangeRegistrationName.setNewUseUnitName(unitName);
             jgChangeRegistrationName.setUseUnitName(reginParams.getCompany().getCompanyName());
+            // 初始时：返回当前登录人的公司信息，用来判断是否新名称是否可编辑
+            dtoMap.put("isInProvince", this.justIsInProvince(reginParams.getCompany().getCompanyCode()));
         }
         BeanUtil.copyProperties(jgChangeRegistrationName, dtoMap);
         dtoMap.put("changeCertificate", JSON.parseArray(jgChangeRegistrationName.getChangeCertificate()));
@@ -753,6 +766,21 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         return map;
     }
 
+    private Boolean justIsInProvince(String companyCode){
+        TzBaseEnterpriseInfo baseEnterpriseInfo = baseEnterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseCode, companyCode));
+        if(baseEnterpriseInfo == null ){
+            log.warn(companyCode + "无企业信息");
+            return false;
+        }
+        String dataSource = baseEnterpriseInfo.getDataSources();
+        String registerType = baseEnterpriseInfo.getRegisterType();
+        String[] disabledDataSource =  {"企业注册", "陕西省内企业"};
+        String[] disabledRegisterType = {"企业单位"};
+        // 省内的企业且类型为企业时
+        return Arrays.asList(disabledDataSource).contains(dataSource) && Arrays.asList(disabledRegisterType).contains(registerType);
+    }
+
+
     public Page<Map<String, Object>> getList(JgChangeRegistrationNameDto dto, Page<Map<String, Object>> page, List<String> roleIds, String companyCode) {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(dto.getReceiveOrgCode())) {
             String[] receiveOrgIdList = dto.getReceiveOrgCode().split("_");

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/TzBaseEnterpriseInfo.java

@@ -187,4 +187,7 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
     @ApiModelProperty(value = "企业标签信息")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String regulatoryLabels;
+
+    @ApiModelProperty(value = "注册类型")
+    private String registerType;
 }