DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(leave): 添加请假统计功能和优化查询条件

Browse Source 
- 新增根据请假人分组获取请假信息的接口方法
- 在WmsLeaveRequestBo中添加beginTime、endTimeParam和leaveIds字段
- 重构buildQueryWrapper方法支持按ID列表查询和时间范围交叉查询
- 添加按请假人分组统计的数据库查询实现
- 移除WmsLeaveRequestVo中leaveId和attachmentUrls的Excel导出注解
- 在WmsMealReportService中添加用户昵称映射功能
- 为WmsMealReportVo添加创建人和更新人姓名字段
This commit is contained in:
Joshi
2026-01-19 10:16:00 +08:00
parent 0b202f9ee2
commit d17272fbe4
7 changed files with 148 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java
View File

@@ -15,10 +15,8 @@ import com.klp.domain.WmsLeaveRequest;
import com.klp.mapper.WmsLeaveRequestMapper;
import com.klp.service.IWmsLeaveRequestService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Date;
import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
@@ -63,16 +61,52 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService {
private LambdaQueryWrapper<WmsLeaveRequest> buildQueryWrapper(WmsLeaveRequestBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsLeaveRequest> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getLeaveTitle()), WmsLeaveRequest::getLeaveTitle, bo.getLeaveTitle());
lqw.eq(StringUtils.isNotBlank(bo.getLeaveType()), WmsLeaveRequest::getLeaveType, bo.getLeaveType());
lqw.like(StringUtils.isNotBlank(bo.getApplicantName()), WmsLeaveRequest::getApplicantName, bo.getApplicantName());
lqw.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), WmsLeaveRequest::getApplicantDeptName, bo.getApplicantDeptName());
lqw.eq(bo.getStartTime() != null, WmsLeaveRequest::getStartTime, bo.getStartTime());
lqw.eq(bo.getEndTime() != null, WmsLeaveRequest::getEndTime, bo.getEndTime());
lqw.eq(StringUtils.isNotBlank(bo.getLeaveShift()), WmsLeaveRequest::getLeaveShift, bo.getLeaveShift());
lqw.eq(bo.getLeaveDays() != null, WmsLeaveRequest::getLeaveDays, bo.getLeaveDays());
lqw.eq(StringUtils.isNotBlank(bo.getLeaveReason()), WmsLeaveRequest::getLeaveReason, bo.getLeaveReason());
lqw.eq(StringUtils.isNotBlank(bo.getAttachmentUrls()), WmsLeaveRequest::getAttachmentUrls, bo.getAttachmentUrls());
// 如果传入了ids，则按ids筛选，否则按其他条件筛选
if (StringUtils.isNotBlank(bo.getLeaveIds())) {
String[] idArray = bo.getLeaveIds().split(",");
List<Long> idList = new ArrayList<>();
for (String id : idArray) {
if (StringUtils.isNotBlank(id)) {
try {
idList.add(Long.parseLong(id.trim()));
} catch (NumberFormatException e) {
// 忽略无效的ID
}
}
}
if (!idList.isEmpty()) {
lqw.in(WmsLeaveRequest::getLeaveId, idList);
}
} else {
// 正常的条件筛选
lqw.eq(StringUtils.isNotBlank(bo.getLeaveTitle()), WmsLeaveRequest::getLeaveTitle, bo.getLeaveTitle());
lqw.eq(StringUtils.isNotBlank(bo.getLeaveType()), WmsLeaveRequest::getLeaveType, bo.getLeaveType());
lqw.like(StringUtils.isNotBlank(bo.getApplicantName()), WmsLeaveRequest::getApplicantName, bo.getApplicantName());
lqw.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), WmsLeaveRequest::getApplicantDeptName, bo.getApplicantDeptName());
// 请假时间范围筛选：筛选出请假时间与查询时间范围有交集的记录
// 条件：(start_time <= endTimeParam AND end_time >= beginTime)
if (bo.getBeginTime() != null && bo.getEndTimeParam() != null) {
lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTimeParam())
.ge(WmsLeaveRequest::getEndTime, bo.getBeginTime());
} else if (bo.getBeginTime() != null) {
lqw.ge(WmsLeaveRequest::getEndTime, bo.getBeginTime());
} else if (bo.getEndTimeParam() != null) {
lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTimeParam());
}
lqw.eq(bo.getStartTime() != null, WmsLeaveRequest::getStartTime, bo.getStartTime());
lqw.eq(bo.getEndTime() != null, WmsLeaveRequest::getEndTime, bo.getEndTime());
lqw.eq(StringUtils.isNotBlank(bo.getLeaveShift()), WmsLeaveRequest::getLeaveShift, bo.getLeaveShift());
lqw.eq(bo.getLeaveDays() != null, WmsLeaveRequest::getLeaveDays, bo.getLeaveDays());
lqw.eq(StringUtils.isNotBlank(bo.getLeaveReason()), WmsLeaveRequest::getLeaveReason, bo.getLeaveReason());
lqw.eq(StringUtils.isNotBlank(bo.getAttachmentUrls()), WmsLeaveRequest::getAttachmentUrls, bo.getAttachmentUrls());
}
// 按请假开始时间倒序排列
lqw.orderByDesc(WmsLeaveRequest::getStartTime);
return lqw;
}
@@ -173,4 +207,37 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService {
.orderByAsc("month");
return baseMapper.selectMaps(qw);
}
/**
* 根据请假人分组获取请假信息
*/
@Override
public List<Map<String, Object>> getLeaveListGroupedByApplicant(WmsLeaveRequestBo bo) {
QueryWrapper<WmsLeaveRequest> qw = new QueryWrapper<>();
qw.select("applicant_name",
"applicant_dept_name",
"GROUP_CONCAT(CONCAT(leave_type, ':', DATE_FORMAT(start_time, '%Y-%m-%d %H:%i'), '~', DATE_FORMAT(end_time, '%Y-%m-%d %H:%i'), '(', leave_days, '天)') ORDER BY start_time SEPARATOR '; ') as leave_details",
"SUM(leave_days) as total_days",
"COUNT(*) as leave_count")
.eq("del_flag", 0);
// 时间范围筛选
if (bo.getBeginTime() != null && bo.getEndTimeParam() != null) {
qw.le("start_time", bo.getEndTimeParam())
.ge("end_time", bo.getBeginTime());
} else if (bo.getBeginTime() != null) {
qw.ge("end_time", bo.getBeginTime());
} else if (bo.getEndTimeParam() != null) {
qw.le("start_time", bo.getEndTimeParam());
}
// 其他筛选条件
qw.eq(StringUtils.isNotBlank(bo.getLeaveType()), "leave_type", bo.getLeaveType())
.like(StringUtils.isNotBlank(bo.getApplicantName()), "applicant_name", bo.getApplicantName())
.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), "applicant_dept_name", bo.getApplicantDeptName())
.groupBy("applicant_name", "applicant_dept_name")
.orderByDesc("total_days");
return baseMapper.selectMaps(qw);
}
}