Commit d96623bc authored by huyuchen's avatar huyuchen

huych-入职登记提交

parent 75f342f7
...@@ -7,6 +7,7 @@ import lombok.Data; ...@@ -7,6 +7,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 确认接受vo * 确认接受vo
...@@ -115,4 +116,7 @@ public class EmployeeRegistrationPreVo implements Serializable { ...@@ -115,4 +116,7 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema(description = "更新人") @Schema(description = "更新人")
private String updateBy; private String updateBy;
@Schema(description = "身份证合集")
private List<String> idcardList;
} }
...@@ -86,4 +86,8 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration { ...@@ -86,4 +86,8 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration {
@Schema(description = "列表类型 1 待办 2监控") @Schema(description = "列表类型 1 待办 2监控")
private String type; private String type;
@Schema(description = "身份证合集")
@TableField(exist = false)
private List<String> idcardList;
} }
...@@ -570,6 +570,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -570,6 +570,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
searchVo.setStatusList(CommonConstants.processPreStatus); searchVo.setStatusList(CommonConstants.processPreStatus);
searchVo.setTypeList(CommonConstants.processPreStatus); searchVo.setTypeList(CommonConstants.processPreStatus);
searchVo.setDeptNo(preVo.getDeptNo()); searchVo.setDeptNo(preVo.getDeptNo());
if (Common.isNotNull(preVo.getIdcardList())) {
searchVo.setIdcardList(preVo.getIdcardList());
}
List<EmployeeRegistration> registrationList = baseMapper.getEmployeeRegistrationList(searchVo); List<EmployeeRegistration> registrationList = baseMapper.getEmployeeRegistrationList(searchVo);
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(registrationList)) { if (Common.isEmpty(registrationList)) {
......
...@@ -132,6 +132,12 @@ ...@@ -132,6 +132,12 @@
<if test="employeeRegistration.empIdcard != null and employeeRegistration.empIdcard.trim() != ''"> <if test="employeeRegistration.empIdcard != null and employeeRegistration.empIdcard.trim() != ''">
AND a.emp_idcard like CONCAT('%',#{employeeRegistration.empIdcard},'%') AND a.emp_idcard like CONCAT('%',#{employeeRegistration.empIdcard},'%')
</if> </if>
<if test="employeeRegistration.idcardList != null and employeeRegistration.idcardList.size() > 0 ">
AND a.emp_idcard in
<foreach item="item" index="index" collection="employeeRegistration.idcardList" open="(" separator="," close=")">
'${item}'
</foreach>
</if>
<if test="employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''"> <if test="employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''">
AND a.emp_phone like CONCAT('%',#{employeeRegistration.empPhone},'%') AND a.emp_phone like CONCAT('%',#{employeeRegistration.empPhone},'%')
</if> </if>
......
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