Commit 80a6de49 authored by 李成龙's avatar 李成龙

修改大屏人员详情资质无法展示。

parent a4e4798a
...@@ -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;
} }
...@@ -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;
} }
...@@ -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()));
} }
......
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