From 4e36aaa8896fc8ac474801a5f90f5758b5b622f5 Mon Sep 17 00:00:00 2001 From: yangk Date: Fri, 22 May 2026 15:23:47 +0800 Subject: [PATCH] =?UTF-8?q?fix(ErpTimesheetPreAlloc):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BB=8D=E6=98=AF=E5=85=A8=E9=83=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/erp/domain/bo/ErpTimesheetPreAllocBo.java | 5 +++++ .../oa/erp/domain/vo/ErpTimesheetPreAllocVo.java | 11 ++++------- .../service/impl/ErpTimesheetPreAllocServiceImpl.java | 2 ++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetPreAllocBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetPreAllocBo.java index 153e16aa..70e88dad 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetPreAllocBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetPreAllocBo.java @@ -108,4 +108,9 @@ public class ErpTimesheetPreAllocBo extends BaseEntity { */ private List allocItems; + /** + * 分配单ID串 + */ + private String allocIds; + } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetPreAllocVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetPreAllocVo.java index 939e9a12..821dfa02 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetPreAllocVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpTimesheetPreAllocVo.java @@ -32,7 +32,6 @@ public class ErpTimesheetPreAllocVo implements Serializable { /** * 分配单ID */ - @ExcelProperty(value = "分配单ID") private Long allocId; /** @@ -50,37 +49,35 @@ public class ErpTimesheetPreAllocVo implements Serializable { /** * 关联月标准工时ID(erp_timesheet_standard_month) */ - @ExcelProperty(value = "关联月标准工时ID(erp_timesheet_standard_month)") private Long standardMonthId; /** * 来源预投项目ID */ - @ExcelProperty(value = "来源预投项目ID") private Long projectId; /** * 预投项目编码(冗余) */ - @ExcelProperty(value = "预投项目编码(冗余)") + @ExcelProperty(value = "预投项目编码") private String projectCode; /** * 预投项目名称(冗余) */ - @ExcelProperty(value = "预投项目名称(冗余)") + @ExcelProperty(value = "预投项目名称") private String projectName; /** * 来源预投工时合计(天,带出汇总) */ - @ExcelProperty(value = "来源预投工时合计(天,带出汇总)") + @ExcelProperty(value = "来源预投工时合计") private BigDecimal sourceTotalHours; /** * 已分配合计(天) */ - @ExcelProperty(value = "已分配合计(天)") + @ExcelProperty(value = "已分配合计") private BigDecimal allocatedTotalHours; /** diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocServiceImpl.java index b28619ef..91768da9 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetPreAllocServiceImpl.java @@ -135,6 +135,8 @@ public class ErpTimesheetPreAllocServiceImpl implements IErpTimesheetPreAllocSer .eq(StringUtils.isNotBlank(bo.getProjectCode()), ErpTimesheetPreAlloc::getProjectCode, bo.getProjectCode()) .like(StringUtils.isNotBlank(bo.getProjectName()), ErpTimesheetPreAlloc::getProjectName, bo.getProjectName()) .eq(StringUtils.isNotBlank(bo.getAllocStatus()), ErpTimesheetPreAlloc::getAllocStatus, bo.getAllocStatus()) + .in(StringUtils.isNotBlank(bo.getAllocIds()), ErpTimesheetPreAlloc::getAllocId, + StringUtils.isNotBlank(bo.getAllocIds()) ? List.of(bo.getAllocIds().split(",")) : null) .orderByDesc(ErpTimesheetPreAlloc::getAllocId); }