Commit 88e4cffd authored by hongguangwu's avatar hongguangwu

1.7.24 - 档案待完善的idList

parent ef584eca
...@@ -185,6 +185,9 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap ...@@ -185,6 +185,9 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
String fileName = "档案待完整列表" + DateUtil.getThisTime() + ".xlsx"; String fileName = "档案待完整列表" + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表 //获取要导出的列表
List<EmployeeRegistrationProjectListVo> list = new ArrayList<>(); List<EmployeeRegistrationProjectListVo> list = new ArrayList<>();
if (!Common.isNotNull(searchVo.getIdList()) && Common.isNotNull(searchVo.getIds())) {
searchVo.setIdList(Common.getList(searchVo.getIds()));
}
//权限赋值 //权限赋值
initSearchVo(searchVo); initSearchVo(searchVo);
long count = baseMapper.getAllLackArchivesExportCount(searchVo); long count = baseMapper.getAllLackArchivesExportCount(searchVo);
......
...@@ -120,6 +120,12 @@ ...@@ -120,6 +120,12 @@
<if test="employeeRegistrationPre.id != null and employeeRegistrationPre.id.trim() != ''"> <if test="employeeRegistrationPre.id != null and employeeRegistrationPre.id.trim() != ''">
AND a.id = #{employeeRegistrationPre.id} AND a.id = #{employeeRegistrationPre.id}
</if> </if>
<if test="employeeRegistrationPre.idList != null and employeeRegistrationPre.idList.size() > 0">
AND a.id in
<foreach item="idStr" index="index" collection="employeeRegistrationPre.idList" open="(" separator="," close=")">
#{idStr}
</foreach>
</if>
<if test="employeeRegistrationPre.employeeName != null and employeeRegistrationPre.employeeName.trim() != ''"> <if test="employeeRegistrationPre.employeeName != null and employeeRegistrationPre.employeeName.trim() != ''">
AND a.EMP_NAME like CONCAT('%',#{employeeRegistrationPre.employeeName},'%') AND a.EMP_NAME like CONCAT('%',#{employeeRegistrationPre.employeeName},'%')
</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