feat(leave): 添加请假统计功能和优化查询条件
- 新增根据请假人分组获取请假信息的接口方法 - 在WmsLeaveRequestBo中添加beginTime、endTimeParam和leaveIds字段 - 重构buildQueryWrapper方法支持按ID列表查询和时间范围交叉查询 - 添加按请假人分组统计的数据库查询实现 - 移除WmsLeaveRequestVo中leaveId和attachmentUrls的Excel导出注解 - 在WmsMealReportService中添加用户昵称映射功能 - 为WmsMealReportVo添加创建人和更新人姓名字段
This commit is contained in:
@@ -55,6 +55,21 @@ public class WmsLeaveRequestBo extends BaseEntity {
|
||||
*/
|
||||
private Date endTime;
|
||||
|
||||
/**
|
||||
* 查询开始时间(用于筛选请假时间范围)
|
||||
*/
|
||||
private Date beginTime;
|
||||
|
||||
/**
|
||||
* 查询结束时间(用于筛选请假时间范围)
|
||||
*/
|
||||
private Date endTimeParam;
|
||||
|
||||
/**
|
||||
* 导出ID列表(逗号分隔)
|
||||
*/
|
||||
private String leaveIds;
|
||||
|
||||
/**
|
||||
* 请假班次(早班/中班/晚班/夜班/全天等)
|
||||
*/
|
||||
|
||||
@@ -26,7 +26,6 @@ public class WmsLeaveRequestVo extends BaseEntity {
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "主键ID")
|
||||
private Long leaveId;
|
||||
|
||||
/**
|
||||
@@ -88,8 +87,6 @@ public class WmsLeaveRequestVo extends BaseEntity {
|
||||
/**
|
||||
* 附件(病假证明等)
|
||||
*/
|
||||
@ExcelProperty(value = "附件", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "病=假证明等")
|
||||
private String attachmentUrls;
|
||||
|
||||
/**
|
||||
|
||||
@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -83,4 +84,7 @@ public class WmsMealReportVo extends BaseEntity {
|
||||
private String remark;
|
||||
|
||||
|
||||
private String createByName;
|
||||
private String updateByName;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user