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
fff6a014
Commit
fff6a014
authored
Jul 21, 2025
by
hcing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(tcm): 人员详情返回所在单位的企业所在地
parent
f70b3393
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
TzsUserInfoVo.java
...om/yeejoin/amos/boot/module/tcm/api/vo/TzsUserInfoVo.java
+4
-1
TzsUserInfoServiceImpl.java
...t/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
+4
-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/vo/TzsUserInfoVo.java
View file @
fff6a014
...
@@ -181,6 +181,9 @@ public class TzsUserInfoVo {
...
@@ -181,6 +181,9 @@ public class TzsUserInfoVo {
@ApiModelProperty
(
value
=
"养老保险证明"
)
@ApiModelProperty
(
value
=
"养老保险证明"
)
private
List
<?>
pensionInsurance
;
private
List
<?>
pensionInsurance
;
@
TableField
(
value
=
"检验人员证书"
)
@
ApiModelProperty
(
value
=
"检验人员证书"
)
private
List
<?>
inspectorCert
;
private
List
<?>
inspectorCert
;
@ApiModelProperty
(
value
=
"企业属于省内还是省外"
)
private
String
dataSources
;
}
}
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/TzsUserInfoServiceImpl.java
View file @
fff6a014
...
@@ -356,6 +356,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -356,6 +356,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
}
else
{
}
else
{
unitTypeAllPostCode
=
this
.
getAllUserType
().
stream
().
map
(
DataDictionary:
:
getCode
).
collect
(
Collectors
.
toList
());
unitTypeAllPostCode
=
this
.
getAllUserType
().
stream
().
map
(
DataDictionary:
:
getCode
).
collect
(
Collectors
.
toList
());
}
}
TzBaseEnterpriseInfo
enterpriseInfo
=
baseEnterpriseInfoService
.
lambdaQuery
()
.
eq
(
TzBaseEnterpriseInfo:
:
getUseCode
,
reginParams
.
getCompany
().
getCompanyCode
())
.
one
();
Map
<
String
,
Object
>
maps
=
new
HashMap
<>();
Map
<
String
,
Object
>
maps
=
new
HashMap
<>();
TzsUserInfo
tzsUserInfo
=
tzsUserInfoMapper
.
selectById
(
id
);
TzsUserInfo
tzsUserInfo
=
tzsUserInfoMapper
.
selectById
(
id
);
TzsUserInfoVo
tzsUserInfoVo
=
new
TzsUserInfoVo
();
TzsUserInfoVo
tzsUserInfoVo
=
new
TzsUserInfoVo
();
...
@@ -401,6 +404,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -401,6 +404,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
tzsUserInfoVo
.
setPowerAttorney
(
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getPowerAttorney
())
?
null
:
JSON
.
parseArray
(
tzsUserInfo
.
getPowerAttorney
()));
tzsUserInfoVo
.
setPowerAttorney
(
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getPowerAttorney
())
?
null
:
JSON
.
parseArray
(
tzsUserInfo
.
getPowerAttorney
()));
tzsUserInfoVo
.
setPensionInsurance
(
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getPensionInsurance
())
?
null
:
JSON
.
parseArray
(
tzsUserInfo
.
getPensionInsurance
()));
tzsUserInfoVo
.
setPensionInsurance
(
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getPensionInsurance
())
?
null
:
JSON
.
parseArray
(
tzsUserInfo
.
getPensionInsurance
()));
tzsUserInfoVo
.
setInspectorCert
(
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getInspectorCert
())
?
null
:
JSON
.
parseArray
(
tzsUserInfo
.
getInspectorCert
()));
tzsUserInfoVo
.
setInspectorCert
(
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getInspectorCert
())
?
null
:
JSON
.
parseArray
(
tzsUserInfo
.
getInspectorCert
()));
tzsUserInfoVo
.
setDataSources
(
enterpriseInfo
.
getDataSources
());
String
companyType
=
getUnitType
();
String
companyType
=
getUnitType
();
tzsUserInfoVo
.
setCompanyType
(
companyType
.
contains
(
"个人主体"
)
?
"individual"
:
"no-individual"
);
tzsUserInfoVo
.
setCompanyType
(
companyType
.
contains
(
"个人主体"
)
?
"individual"
:
"no-individual"
);
Map
<
String
,
Object
>
userInfoMap
=
BeanUtil
.
beanToMap
(
tzsUserInfoVo
);
Map
<
String
,
Object
>
userInfoMap
=
BeanUtil
.
beanToMap
(
tzsUserInfoVo
);
...
...
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