diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java index b0613b94..632350a5 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java @@ -1,8 +1,11 @@ package com.zcloud.basic.info.dto; import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * web-client @@ -26,7 +29,6 @@ public class UserQryCmd { private String eqCorpinfoId; private String eqDepartmentId; private String eqPostId; - private String eqEmploymentFlag; private Long corpinfoId; private Long departmentId; @@ -34,5 +36,11 @@ public class UserQryCmd { private String username; private Integer noMain; private String isMyCorp; + + @ApiModelProperty(value = "是否流动人员,1-流动,0-固定人员", name = "flowFlag") + private Integer flowFlag; + // 入职状态 + @ApiModelProperty(value = "入职状态 入职状态,0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核") + private Integer employmentFlag; } diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 842c1058..649681cd 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -52,6 +52,7 @@ u.political_affiliation, u.political_affiliation_name, u.employment_flag, + u.flow_flag, CASE WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN @@ -85,6 +86,9 @@ and u.employment_flag = #{params.employmentFlag} + + and u.flow_flag = #{params.flowFlag} +