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
e64007f5
Commit
e64007f5
authored
Apr 03, 2024
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
检验检测单位许可调整为可编辑
parent
4c68d44a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
TzBaseEnterpriseInfoDto.java
...amos/boot/module/tcm/api/dto/TzBaseEnterpriseInfoDto.java
+4
-1
TzBaseEnterpriseInfoServiceImpl.java
...tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
+2
-0
RegUnitInfoServiceImpl.java
...dule/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java
+5
-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/dto/TzBaseEnterpriseInfoDto.java
View file @
e64007f5
...
@@ -312,6 +312,9 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
...
@@ -312,6 +312,9 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
// 事业单位信息
// 事业单位信息
private
TzsBaseInstitution
regUnitMessage
;
private
TzsBaseInstitution
regUnitMessage
;
// 工商
和许可
信息是否可编辑
// 工商信息是否可编辑
private
String
canEdit
;
private
String
canEdit
;
// 许可信息是否可编辑
private
String
licenseCanEdit
;
}
}
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/TzBaseEnterpriseInfoServiceImpl.java
View file @
e64007f5
...
@@ -250,6 +250,7 @@ public class TzBaseEnterpriseInfoServiceImpl
...
@@ -250,6 +250,7 @@ public class TzBaseEnterpriseInfoServiceImpl
regUnitIcDto
.
setIsNotAccess
(
"1"
);
regUnitIcDto
.
setIsNotAccess
(
"1"
);
// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
tzBaseEnterpriseInfoDto
.
setCanEdit
(
"0"
);
tzBaseEnterpriseInfoDto
.
setCanEdit
(
"0"
);
tzBaseEnterpriseInfoDto
.
setLicenseCanEdit
(
"1"
);
}
else
{
}
else
{
regUnitIcDto
=
tzBaseEnterpriseInfoDto
.
getRegUnitIcDto
();
regUnitIcDto
=
tzBaseEnterpriseInfoDto
.
getRegUnitIcDto
();
regUnitIcDto
.
setIsNotAccess
(
"0"
);
regUnitIcDto
.
setIsNotAccess
(
"0"
);
...
@@ -260,6 +261,7 @@ public class TzBaseEnterpriseInfoServiceImpl
...
@@ -260,6 +261,7 @@ public class TzBaseEnterpriseInfoServiceImpl
regUnitIcDto
.
setRegisterAddressList
(
addressList
);
regUnitIcDto
.
setRegisterAddressList
(
addressList
);
// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
tzBaseEnterpriseInfoDto
.
setCanEdit
(
"1"
);
tzBaseEnterpriseInfoDto
.
setCanEdit
(
"1"
);
tzBaseEnterpriseInfoDto
.
setLicenseCanEdit
(
"1"
);
}
}
tzBaseEnterpriseInfoDto
.
setRegUnitIcDto
(
regUnitIcDto
);
tzBaseEnterpriseInfoDto
.
setRegUnitIcDto
(
regUnitIcDto
);
tzBaseEnterpriseInfoDto
.
setApprovalTime
(
regUnitIcDto
.
getApprovedDate
());
tzBaseEnterpriseInfoDto
.
setApprovalTime
(
regUnitIcDto
.
getApprovedDate
());
...
...
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 @
e64007f5
...
@@ -187,6 +187,11 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
...
@@ -187,6 +187,11 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
// 2.异步调用ugp,同步公司数据
// 2.异步调用ugp,同步公司数据
FutureTask
<
ResponseModel
<
Boolean
>>
future
=
getResponseModelFutureTask
(
model
);
FutureTask
<
ResponseModel
<
Boolean
>>
future
=
getResponseModelFutureTask
(
model
);
// 3.插入单位注册许可信息表:tz_base_unit_licence
// 3.插入单位注册许可信息表:tz_base_unit_licence
// 3.1先删除已有许可信息 (2024-04-02放开企业许可信息编辑功能)
LambdaQueryWrapper
<
BaseUnitLicence
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
queryWrapper
.
eq
(
BaseUnitLicence:
:
getUnitCode
,
model
.
getUnitCode
());
baseUnitLicenceService
.
remove
(
queryWrapper
);
// 3.2再插入新许可信息
List
<
BaseUnitLicence
>
baseUnitLicences
=
model
.
getUnitLicences
().
stream
().
map
(
s
->
{
List
<
BaseUnitLicence
>
baseUnitLicences
=
model
.
getUnitLicences
().
stream
().
map
(
s
->
{
s
.
setUnitCode
(
model
.
getUnitCode
());
s
.
setUnitCode
(
model
.
getUnitCode
());
s
.
setUnitName
(
model
.
getName
());
s
.
setUnitName
(
model
.
getName
());
...
...
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