Commit b03a2e04 authored by tianbo's avatar tianbo

feat(tcm): 新增企业标签信息默认值配置

- 在RegUnitInfoServiceImpl中引入UnitTypeEnum枚举 - 添加默认企业标签配置项defaultRegulatoryLabels- 为事业单位类型单位自动设置默认企业标签 - 移除TzBaseEnterpriseInfo中regulatoryLabels字段的更新策略限制
parent 2110acdb
package com.yeejoin.amos.boot.module.tcm.api.entity; package com.yeejoin.amos.boot.module.tcm.api.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
...@@ -185,7 +184,6 @@ public class TzBaseEnterpriseInfo extends BaseEntity { ...@@ -185,7 +184,6 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
private String industrySupervisor; private String industrySupervisor;
@ApiModelProperty(value = "企业标签信息") @ApiModelProperty(value = "企业标签信息")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String regulatoryLabels; private String regulatoryLabels;
@ApiModelProperty(value = "注册类型") @ApiModelProperty(value = "注册类型")
......
...@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.biz.common.utils.TreeParser; ...@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService; import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr; import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.enums.UnitDataSourceEnum; import com.yeejoin.amos.boot.module.common.api.enums.UnitDataSourceEnum;
import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeNewEnum; import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeNewEnum;
import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher; import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent; import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
...@@ -180,6 +181,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -180,6 +181,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
@Autowired @Autowired
DataDictionaryServiceImpl dataDictionaryService; DataDictionaryServiceImpl dataDictionaryService;
@Value("${enterprise.regulatoryLabels.default.value:三级管控}")
private String defaultRegulatoryLabels;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public RegUnitInfoDto registerUnit(RegUnitInfoDto model) { public RegUnitInfoDto registerUnit(RegUnitInfoDto model) {
...@@ -430,6 +434,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -430,6 +434,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
baseEnterpriseInfo.setAddress(regUnitInfo.getAddress()); baseEnterpriseInfo.setAddress(regUnitInfo.getAddress());
baseEnterpriseInfo.setUseContact(regUnitInfo.getName()); baseEnterpriseInfo.setUseContact(regUnitInfo.getName());
baseEnterpriseInfo.setContactPhone(regUnitInfo.getAdminTel()); baseEnterpriseInfo.setContactPhone(regUnitInfo.getAdminTel());
baseEnterpriseInfo.setRegulatoryLabels(defaultRegulatoryLabels);
} else { } else {
baseEnterpriseInfo.setOfficeRegion(regUnitInfo.getOfficeRegion()); baseEnterpriseInfo.setOfficeRegion(regUnitInfo.getOfficeRegion());
baseEnterpriseInfo.setOfficeAddress(regUnitInfo.getOfficeAddress()); baseEnterpriseInfo.setOfficeAddress(regUnitInfo.getOfficeAddress());
...@@ -447,6 +452,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -447,6 +452,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
baseEnterpriseInfo.setContactPhone(regUnitInfo.getAdminTel()); baseEnterpriseInfo.setContactPhone(regUnitInfo.getAdminTel());
baseEnterpriseInfo.setUseUnitCode(regUnitInfo.getUnitCode()); baseEnterpriseInfo.setUseUnitCode(regUnitInfo.getUnitCode());
baseEnterpriseInfo.setUseUnitCertificate(regUnitInfo.getUnitCodeTypeName()); baseEnterpriseInfo.setUseUnitCertificate(regUnitInfo.getUnitCodeTypeName());
if (baseEnterpriseInfo.getUnitType().contains(UnitTypeEnum.SYDW.getName())) {
baseEnterpriseInfo.setRegulatoryLabels(defaultRegulatoryLabels);
}
} }
// 管辖机构信息 // 管辖机构信息
baseEnterpriseInfo.setSuperviseCode(regUnitInfo.getManagementUnitCompanyCode()); baseEnterpriseInfo.setSuperviseCode(regUnitInfo.getManagementUnitCompanyCode());
......
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