Commit ca697b84 by 东州 翁 Committed by chenzg

更改查询员工列表接口,添加了头像url一列

parent 931ed06c
......@@ -130,7 +130,7 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
@ApiModelProperty(value="工作性质 1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="101")
private Integer jobType;
@ApiModelProperty(value="员工状态 1试用、2正式、3离职中、4已离职",example="101")
@ApiModelProperty(value="员工状态 0试用、1正式、2离职中、3已离职",example="101")
private Integer jobStatus;
@ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间")
......
......@@ -1756,6 +1756,11 @@ public class YgglController {
@ApiOperationSupport(order = 62)
public Result<List<YgQueryDto>> queryEmpMessage(@CurrentUser UserBean userBean) {
List<YgQueryDto> ygQueryDto = ygglMainEmpMapper.queryEmpMessage(userBean);
for (YgQueryDto yg : ygQueryDto) {
if (StringUtil.isEmpty(yg.getHeadUrl())) {
yg.setHeadUrl("");
}
}
return ResultUtil.data(ygQueryDto, "查询成功");
}
......
......@@ -66,4 +66,7 @@ public class YgQueryDto extends Page implements Serializable{
@ApiModelProperty(value="离职原因",example="123")
private String lzyy;
@ApiModelProperty(value="头像url",example="url")
private String headUrl;
}
......@@ -199,14 +199,15 @@
a.rz_time rzTime,
a.job_type jobType,
a.phone phone,
a.job_status jobStatus
a.job_status jobStatus,
a.head_url headUrl
FROM
yggl_main_emp a
LEFT JOIN zzgl_bmgw_m b ON a.bmgw_id = b.id
WHERE
a.org_code = #{orgCode}
AND
a.job_status != 4
a.job_status in (0,1,2)
ORDER BY
emp_num DESC
</select>
......
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