feat(oa/erp): 添加月份字段支持到工时表汇总详情功能

- 在 ErpTimesheetSummaryDetailBo 中新增 monthCode 字段
- 在查询逻辑中添加对月份字段的映射和筛选条件
- 在 ErpTimesheetSummaryDetailVo 中新增 monthCode 字段并配置 Excel 导出
- 实现月份字段的完整业务逻辑支持
dev
yangk 1 month ago
parent db869123dd
commit cf36886098

@ -38,6 +38,11 @@ public class ErpTimesheetSummaryDetailBo extends BaseEntity {
*/
private String summaryCode;
/**
*
*/
private String monthCode;
/**
*
*/

@ -45,6 +45,12 @@ public class ErpTimesheetSummaryDetailVo implements Serializable {
@ExcelProperty(value = "关联汇总主表编号")
private String summaryCode;
/**
*
*/
@ExcelProperty(value = "月份")
private String monthCode;
/**
*
*/

@ -74,10 +74,12 @@ public class ErpTimesheetSummaryDetailServiceImpl implements IErpTimesheetSummar
MPJLambdaWrapper<ErpTimesheetSummaryDetail> lqw = JoinWrappers.lambda(ErpTimesheetSummaryDetail.class)
.selectAll(ErpTimesheetSummaryDetail.class)
.selectAs(ErpTimesheetSummary::getSummaryCode, ErpTimesheetSummaryDetailVo::getSummaryCode)
.selectAs(ErpTimesheetSummary::getMonthCode, ErpTimesheetSummaryDetailVo::getMonthCode)
.leftJoin(ErpTimesheetSummary.class, ErpTimesheetSummary::getSummaryId, ErpTimesheetSummaryDetail::getSummaryId)
.eq(ErpTimesheetSummaryDetail::getDelFlag, "0")
.eq(bo.getSummaryId() != null, ErpTimesheetSummaryDetail::getSummaryId, bo.getSummaryId())
.eq(StringUtils.isNotBlank(bo.getSummaryCode()), ErpTimesheetSummary::getSummaryCode, bo.getSummaryCode())
.eq(StringUtils.isNotBlank(bo.getMonthCode()), ErpTimesheetSummary::getMonthCode, bo.getMonthCode())
.eq(bo.getSortOrder() != null, ErpTimesheetSummaryDetail::getSortOrder, bo.getSortOrder())
.eq(bo.getStaffUserId() != null, ErpTimesheetSummaryDetail::getStaffUserId, bo.getStaffUserId())
.like(StringUtils.isNotBlank(bo.getStaffName()), ErpTimesheetSummaryDetail::getStaffName, bo.getStaffName())

Loading…
Cancel
Save