Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
b03a2e04
Commit
b03a2e04
authored
Sep 24, 2025
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(tcm): 新增企业标签信息默认值配置
- 在RegUnitInfoServiceImpl中引入UnitTypeEnum枚举 - 添加默认企业标签配置项defaultRegulatoryLabels- 为事业单位类型单位自动设置默认企业标签 - 移除TzBaseEnterpriseInfo中regulatoryLabels字段的更新策略限制
parent
2110acdb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
TzBaseEnterpriseInfo.java
...amos/boot/module/tcm/api/entity/TzBaseEnterpriseInfo.java
+0
-2
RegUnitInfoServiceImpl.java
...dule/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java
+8
-0
No files found.
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseEnterpriseInfo.java
View file @
b03a2e04
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
=
"注册类型"
)
...
...
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
View file @
b03a2e04
...
@@ -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
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment