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
80a6de49
Commit
80a6de49
authored
Jul 22, 2025
by
李成龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改大屏人员详情资质无法展示。
parent
a4e4798a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
0 deletions
+48
-0
TzsUserInfo.java
...n/amos/boot/module/statistics/api/entity/TzsUserInfo.java
+29
-0
TzsUserInfoVo.java
...oin/amos/boot/module/statistics/api/vo/TzsUserInfoVo.java
+16
-0
UserBizByTCMServiceImpl.java
...e/statistcs/biz/service/impl/UserBizByTCMServiceImpl.java
+3
-0
No files found.
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/entity/TzsUserInfo.java
View file @
80a6de49
...
@@ -50,6 +50,7 @@ public class TzsUserInfo extends BaseEntity {
...
@@ -50,6 +50,7 @@ public class TzsUserInfo extends BaseEntity {
* 岗位-保留兼容下游数据查询
* 岗位-保留兼容下游数据查询
*/
*/
@TableField
(
"post"
)
@TableField
(
"post"
)
@Deprecated
private
String
post
;
private
String
post
;
/**
/**
...
@@ -200,5 +201,33 @@ public class TzsUserInfo extends BaseEntity {
...
@@ -200,5 +201,33 @@ public class TzsUserInfo extends BaseEntity {
*/
*/
@TableField
(
"qr_code_state"
)
@TableField
(
"qr_code_state"
)
private
String
qrCodeState
;
private
String
qrCodeState
;
/**
* 岗位子类型(多个逗号分割)
*/
@TableField
(
value
=
"sub_post"
,
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
subPost
;
/**
* 岗位子类型名称(多个逗号分割)
*/
@TableField
(
value
=
"sub_post_name"
,
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
subPostName
;
/**
* 人员转出标识(1:已转出,0:未转出,空值默认为未转出0)
*/
@TableField
(
value
=
"transfer_out"
)
protected
String
transferOut
;
/**
* 人员转出时间
*/
@TableField
(
value
=
"transfer_out_time"
)
protected
Date
transferOutTime
;
/**
* 创建时间
*/
@TableField
(
value
=
"create_date"
)
protected
Date
createDate
;
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/vo/TzsUserInfoVo.java
View file @
80a6de49
...
@@ -40,6 +40,7 @@ public class TzsUserInfoVo {
...
@@ -40,6 +40,7 @@ public class TzsUserInfoVo {
* 岗位
* 岗位
*/
*/
@TableField
(
"post"
)
@TableField
(
"post"
)
@Deprecated
private
JSONArray
post
;
private
JSONArray
post
;
/**
/**
...
@@ -156,4 +157,19 @@ public class TzsUserInfoVo {
...
@@ -156,4 +157,19 @@ public class TzsUserInfoVo {
*/
*/
private
String
jobTitle
;
private
String
jobTitle
;
@ApiModelProperty
(
value
=
"人员类型名称"
)
private
String
postName
;
@ApiModelProperty
(
"岗位子类型(多个逗号分割)"
)
private
JSONArray
subPost
;
@ApiModelProperty
(
"岗位子类型名称(多个逗号分割)"
)
private
String
subPostName
;
@ApiModelProperty
(
value
=
"执业注册"
)
private
List
practiceRegistration
;
@ApiModelProperty
(
value
=
"劳动合同"
)
private
List
laborContract
;
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/UserBizByTCMServiceImpl.java
View file @
80a6de49
...
@@ -73,6 +73,9 @@ public class UserBizByTCMServiceImpl {
...
@@ -73,6 +73,9 @@ public class UserBizByTCMServiceImpl {
if
(!
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getNewPost
()))
{
if
(!
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getNewPost
()))
{
tzsUserInfoVo
.
setNewPost
(
JSON
.
parseArray
(
tzsUserInfo
.
getNewPost
()));
tzsUserInfoVo
.
setNewPost
(
JSON
.
parseArray
(
tzsUserInfo
.
getNewPost
()));
}
}
if
(!
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getSubPost
()))
{
tzsUserInfoVo
.
setSubPost
(
JSON
.
parseArray
(
tzsUserInfo
.
getSubPost
()));
}
if
(!
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getEquipType
()))
{
if
(!
ObjectUtils
.
isEmpty
(
tzsUserInfo
.
getEquipType
()))
{
tzsUserInfoVo
.
setEquipType
(
JSON
.
parseArray
(
tzsUserInfo
.
getEquipType
()));
tzsUserInfoVo
.
setEquipType
(
JSON
.
parseArray
(
tzsUserInfo
.
getEquipType
()));
}
}
...
...
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