Commit 5e5e9fc1 authored by hongguangwu's avatar hongguangwu

1.7.24 - 勾选导出

parent 366c3aa9
...@@ -23,6 +23,9 @@ public class EmployeeRegistrationPreSearchVo extends EmployeeRegistrationPre { ...@@ -23,6 +23,9 @@ public class EmployeeRegistrationPreSearchVo extends EmployeeRegistrationPre {
@Schema(description = "选中ID,多个逗号分割") @Schema(description = "选中ID,多个逗号分割")
private String ids; private String ids;
@Schema(description = "选中ID数组")
private List<String> idList;
/** /**
* 创建时间区间 [开始时间,结束时间] * 创建时间区间 [开始时间,结束时间]
*/ */
......
...@@ -39,6 +39,9 @@ public class TEmployeeContractPreNewSearchVo extends TEmployeeContractPreNew { ...@@ -39,6 +39,9 @@ public class TEmployeeContractPreNewSearchVo extends TEmployeeContractPreNew {
@Schema(description = "选中ID,多个逗号分割") @Schema(description = "选中ID,多个逗号分割")
private List<String> ids; private List<String> ids;
@Schema(description = "选中ID数组")
private List<String> idList;
/** /**
* 创建时间区间 [开始时间,结束时间] * 创建时间区间 [开始时间,结束时间]
*/ */
......
...@@ -20,7 +20,7 @@ public class TEmployeeContractPreSearchVo extends TEmployeeContractPre { ...@@ -20,7 +20,7 @@ public class TEmployeeContractPreSearchVo extends TEmployeeContractPre {
/** /**
* 多选导出或删除等操作 * 多选导出或删除等操作
*/ */
@Schema(description = "选中ID,id数组") @Schema(description = "选中ID数组")
private List<String> idList; private List<String> idList;
/** /**
* @Author fxj * @Author fxj
......
...@@ -141,6 +141,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -141,6 +141,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
String fileName = "入职待建档表批量导出" + DateUtil.getThisTime() + ".xlsx"; String fileName = "入职待建档表批量导出" + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表 //获取要导出的列表
List<EmployeeRegistrationPreExportVo> list = new ArrayList<>(); List<EmployeeRegistrationPreExportVo> list = new ArrayList<>();
if (!Common.isNotNull(searchVo.getIdList()) && Common.isNotNull(searchVo.getIds())) {
searchVo.setIdList(Common.getList(searchVo.getIds()));
}
//权限赋值 //权限赋值
initSearchVo(searchVo); initSearchVo(searchVo);
if (Common.isEmpty(searchVo.getStatusList()) if (Common.isEmpty(searchVo.getStatusList())
...@@ -205,6 +208,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -205,6 +208,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
String fileName = "入职确认信息批量导出" + DateUtil.getThisTime() + ".xlsx"; String fileName = "入职确认信息批量导出" + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表 //获取要导出的列表
List<EmployeeRegistrationPreInfoExportVo> list = new ArrayList<>(); List<EmployeeRegistrationPreInfoExportVo> list = new ArrayList<>();
if (!Common.isNotNull(searchVo.getIdList()) && Common.isNotNull(searchVo.getIds())) {
searchVo.setIdList(Common.getList(searchVo.getIds()));
}
//权限赋值 //权限赋值
initSearchVo(searchVo); initSearchVo(searchVo);
if (Common.isEmpty(searchVo.getStatusList()) if (Common.isEmpty(searchVo.getStatusList())
......
...@@ -1187,7 +1187,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -1187,7 +1187,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
**/ **/
@Override @Override
public void listAutoExport(HttpServletResponse response, ContractAlertSearchVo searchVo) { public void listAutoExport(HttpServletResponse response, ContractAlertSearchVo searchVo) {
if (Common.isNotNull(searchVo.getIds())){ if (!Common.isNotNull(searchVo.getIdList()) && Common.isNotNull(searchVo.getIds())) {
searchVo.setIdList(Arrays.asList(searchVo.getIds().split(CommonConstants.COMMA_STRING))); searchVo.setIdList(Arrays.asList(searchVo.getIds().split(CommonConstants.COMMA_STRING)));
} }
// 如果查询条件续签状态为空默认查询 非已完成 状态数据 // 如果查询条件续签状态为空默认查询 非已完成 状态数据
......
...@@ -192,10 +192,14 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -192,10 +192,14 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
@Override @Override
public List<TEmployeeContractPreNew> noPageDiy(TEmployeeContractPreNewSearchVo searchVo) { public List<TEmployeeContractPreNew> noPageDiy(TEmployeeContractPreNewSearchVo searchVo) {
LambdaQueryWrapper<TEmployeeContractPreNew> wrapper = buildQueryWrapper(searchVo); LambdaQueryWrapper<TEmployeeContractPreNew> wrapper = buildQueryWrapper(searchVo);
List<String> idList =searchVo.getIds(); if (Common.isNotNull(searchVo.getIdList())) {
wrapper.in(TEmployeeContractPreNew::getId, searchVo.getIdList());
} else {
List<String> idList = searchVo.getIds();
if (Common.isNotNull(idList)) { if (Common.isNotNull(idList)) {
wrapper.in(TEmployeeContractPreNew::getId, idList); wrapper.in(TEmployeeContractPreNew::getId, idList);
} }
}
if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) { if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd()); wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
} }
...@@ -205,10 +209,14 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -205,10 +209,14 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
private Long noPageCountDiy(TEmployeeContractPreNewSearchVo searchVo) { private Long noPageCountDiy(TEmployeeContractPreNewSearchVo searchVo) {
LambdaQueryWrapper<TEmployeeContractPreNew> wrapper = buildQueryWrapper(searchVo); LambdaQueryWrapper<TEmployeeContractPreNew> wrapper = buildQueryWrapper(searchVo);
if (Common.isNotNull(searchVo.getIdList())) {
wrapper.in(TEmployeeContractPreNew::getId, searchVo.getIdList());
} else {
List<String> idList = searchVo.getIds(); List<String> idList = searchVo.getIds();
if (Common.isNotNull(idList)) { if (Common.isNotNull(idList)) {
wrapper.in(TEmployeeContractPreNew::getId, idList); wrapper.in(TEmployeeContractPreNew::getId, idList);
} }
}
return baseMapper.selectCount(wrapper); return baseMapper.selectCount(wrapper);
} }
......
...@@ -128,6 +128,12 @@ ...@@ -128,6 +128,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.employee_name like CONCAT('%',#{employeeRegistrationPre.employeeName},'%') AND a.employee_name like CONCAT('%',#{employeeRegistrationPre.employeeName},'%')
</if> </if>
......
...@@ -60,6 +60,7 @@ public class EmployeeRegistrationLeaveSearchVo extends EmployeeRegistrationLeave ...@@ -60,6 +60,7 @@ public class EmployeeRegistrationLeaveSearchVo extends EmployeeRegistrationLeave
@TableField(exist = false) @TableField(exist = false)
private List<String> idcardList; private List<String> idcardList;
@Schema(description = "选中ID数组")
private List<String> idList; private List<String> idList;
// 0待确认1待处理2处理中3已处理 // 0待确认1待处理2处理中3已处理
......
...@@ -25,6 +25,9 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration { ...@@ -25,6 +25,9 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration {
@Schema(description = "选中ID,多个逗号分割") @Schema(description = "选中ID,多个逗号分割")
private String ids; private String ids;
@Schema(description = "选中ID数组")
private List<String> idList;
/** /**
* 创建时间区间 [开始时间,结束时间] * 创建时间区间 [开始时间,结束时间]
*/ */
......
...@@ -177,8 +177,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -177,8 +177,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
String fileName = "自动化离职待处理批量导出" + DateUtil.getThisTime() + ".xlsx"; String fileName = "自动化离职待处理批量导出" + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表 //获取要导出的列表
List<EmployeeRegistrationLeaveExportVo> list = new ArrayList<>(); List<EmployeeRegistrationLeaveExportVo> list = new ArrayList<>();
//获取要导出的列表 if (!Common.isNotNull(searchVo.getIdList()) && Common.isNotNull(searchVo.getIds())) {
if (Common.isNotNull(searchVo.getIds())) {
searchVo.setIdList(Common.getList(searchVo.getIds())); searchVo.setIdList(Common.getList(searchVo.getIds()));
} }
//权限赋值 //权限赋值
...@@ -232,6 +231,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -232,6 +231,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
String fileName = "自动化离职确认批量导出" + DateUtil.getThisTime() + ".xlsx"; String fileName = "自动化离职确认批量导出" + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表 //获取要导出的列表
List<EmployeeRegistrationLeaveConfirmExportVo> list = new ArrayList<>(); List<EmployeeRegistrationLeaveConfirmExportVo> list = new ArrayList<>();
if (!Common.isNotNull(searchVo.getIdList()) && Common.isNotNull(searchVo.getIds())) {
searchVo.setIdList(Common.getList(searchVo.getIds()));
}
long count = baseMapper.getEmployeeRegistrationLeaveConfirmTableCount(searchVo); long count = baseMapper.getEmployeeRegistrationLeaveConfirmTableCount(searchVo);
ServletOutputStream out = null; ServletOutputStream out = null;
try { try {
......
...@@ -387,6 +387,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -387,6 +387,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//获取要导出的列表 //获取要导出的列表
List<EmployeeRegistrationHrExportVo> list = new ArrayList<>(); List<EmployeeRegistrationHrExportVo> list = new ArrayList<>();
if (!Common.isNotNull(searchVo.getIdList()) && Common.isNotNull(searchVo.getIds())) {
searchVo.setIdList(Common.getList(searchVo.getIds()));
}
long count = baseMapper.selectExportCount(searchVo); long count = baseMapper.selectExportCount(searchVo);
try (ServletOutputStream out = response.getOutputStream()) { try (ServletOutputStream out = response.getOutputStream()) {
response.setContentType(CommonConstants.MULTIPART_FORM_DATA); response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
<if test="employeeRegistrationLeave.id != null and employeeRegistrationLeave.id.trim() != ''"> <if test="employeeRegistrationLeave.id != null and employeeRegistrationLeave.id.trim() != ''">
AND a.id = #{employeeRegistrationLeave.id} AND a.id = #{employeeRegistrationLeave.id}
</if> </if>
<if test="employeeRegistrationLeave.idList != null"> <if test="employeeRegistrationLeave.idList != null and employeeRegistrationLeave.idList.size() > 0">
AND a.id in AND a.id in
<foreach item="idStr" index="index" collection="employeeRegistrationLeave.idList" open="(" separator="," close=")"> <foreach item="idStr" index="index" collection="employeeRegistrationLeave.idList" open="(" separator="," close=")">
#{idStr} #{idStr}
......
...@@ -128,6 +128,12 @@ ...@@ -128,6 +128,12 @@
<if test="employeeRegistration.id != null and employeeRegistration.id.trim() != ''"> <if test="employeeRegistration.id != null and employeeRegistration.id.trim() != ''">
AND a.id = #{employeeRegistration.id} AND a.id = #{employeeRegistration.id}
</if> </if>
<if test="employeeRegistration.idList != null and employeeRegistration.idList.size() > 0">
AND a.id in
<foreach item="idStr" index="index" collection="employeeRegistration.idList" open="(" separator="," close=")">
#{idStr}
</foreach>
</if>
<if test="employeeRegistration.employeeName != null and employeeRegistration.employeeName.trim() != ''"> <if test="employeeRegistration.employeeName != null and employeeRegistration.employeeName.trim() != ''">
AND a.employee_name like CONCAT('%',#{employeeRegistration.employeeName},'%') AND a.employee_name like CONCAT('%',#{employeeRegistration.employeeName},'%')
</if> </if>
......
...@@ -23,6 +23,7 @@ public class TEmployeeInsurancePreSearchVo extends TEmployeeInsurancePre { ...@@ -23,6 +23,7 @@ public class TEmployeeInsurancePreSearchVo extends TEmployeeInsurancePre {
@Schema(description = "选中ID,多个逗号分割") @Schema(description = "选中ID,多个逗号分割")
private String ids; private String ids;
@Schema(description = "选中ID数组")
private List<String> idList; private List<String> idList;
/** /**
......
...@@ -39,6 +39,7 @@ public class TInsuranceAlertSearchVo extends TInsuranceAlert { ...@@ -39,6 +39,7 @@ public class TInsuranceAlertSearchVo extends TInsuranceAlert {
@Schema(description = "选中ID,多个逗号分割") @Schema(description = "选中ID,多个逗号分割")
private String ids; private String ids;
@Schema(description = "选中ID数组")
private List<String> idList; private List<String> idList;
@Schema(description = "项目权限数组") @Schema(description = "项目权限数组")
......
...@@ -141,6 +141,9 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -141,6 +141,9 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
if (null == searchVo.getStatusList()) { if (null == searchVo.getStatusList()) {
searchVo.setStatusList(CommonConstants.processListPreArchivesStatus); searchVo.setStatusList(CommonConstants.processListPreArchivesStatus);
} }
if (!Common.isNotNull(searchVo.getIdList()) && Common.isNotNull(searchVo.getIds())) {
searchVo.setIdList(Common.getList(searchVo.getIds()));
}
//权限赋值 //权限赋值
initSearchVo(searchVo); initSearchVo(searchVo);
long count = baseMapper.selectExportCount(searchVo); long count = baseMapper.selectExportCount(searchVo);
......
...@@ -97,8 +97,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper, ...@@ -97,8 +97,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
String fileName = "商险待续保导出" + DateUtil.getThisTime() + CommonConstants.XLSX; String fileName = "商险待续保导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表 //获取要导出的列表
List<TInsuranceAlertExportVO> list = null; List<TInsuranceAlertExportVO> list = null;
//获取要导出的列表 if (!Common.isNotNull(searchVo.getIdList()) && Common.isNotNull(searchVo.getIdStr())) {
if (Common.isNotNull(searchVo.getIdStr())) {
searchVo.setIdList(Common.getList(searchVo.getIdStr())); searchVo.setIdList(Common.getList(searchVo.getIdStr()));
} }
//权限赋值 //权限赋值
......
...@@ -19,7 +19,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre { ...@@ -19,7 +19,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre {
/** /**
* 多选导出或删除等操作 * 多选导出或删除等操作
*/ */
@Schema(description = "选中ID") @Schema(description = "选中ID数组")
private List<String> idList; private List<String> idList;
/** /**
* @Author fxj * @Author fxj
......
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