From cf368860982a304701ddd04c7df988bad3048b2d Mon Sep 17 00:00:00 2001 From: yangk Date: Fri, 22 May 2026 09:54:54 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa/erp):=20=E6=B7=BB=E5=8A=A0=E6=9C=88?= =?UTF-8?q?=E4=BB=BD=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81=E5=88=B0=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E8=A1=A8=E6=B1=87=E6=80=BB=E8=AF=A6=E6=83=85=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ErpTimesheetSummaryDetailBo 中新增 monthCode 字段 - 在查询逻辑中添加对月份字段的映射和筛选条件 - 在 ErpTimesheetSummaryDetailVo 中新增 monthCode 字段并配置 Excel 导出 - 实现月份字段的完整业务逻辑支持 --- .../oa/erp/domain/bo/ErpTimesheetSummaryDetailBo.java | 5 +++++ .../oa/erp/domain/vo/ErpTimesheetSummaryDetailVo.java | 6 ++++++ .../service/impl/ErpTimesheetSummaryDetailServiceImpl.java | 2 ++ 3 files changed, 13 insertions(+) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetSummaryDetailBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetSummaryDetailBo.java index 9d0f5d24..ef76e3fc 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetSummaryDetailBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetSummaryDetailBo.java @@ -38,6 +38,11 @@ public class ErpTimesheetSummaryDetailBo extends BaseEntity { */ private String summaryCode; + /** + * 月份 + */ + private String monthCode; + /** * 排序号 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetSummaryDetailVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetSummaryDetailVo.java index c3d92589..c052d895 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetSummaryDetailVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetSummaryDetailVo.java @@ -45,6 +45,12 @@ public class ErpTimesheetSummaryDetailVo implements Serializable { @ExcelProperty(value = "关联汇总主表编号") private String summaryCode; + /** + * 月份 + */ + @ExcelProperty(value = "月份") + private String monthCode; + /** * 排序号 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryDetailServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryDetailServiceImpl.java index 055ef810..ce49e1a7 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryDetailServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetSummaryDetailServiceImpl.java @@ -74,10 +74,12 @@ public class ErpTimesheetSummaryDetailServiceImpl implements IErpTimesheetSummar MPJLambdaWrapper 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())