fix(ErpTimesheetPreAlloc): 修复勾选部分数据时导出仍是全部数据的问题

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<PreAllocTargetBo> allocItems;
 
+    /**
+     * 分配单ID串
+     */
+    private String allocIds;
+
 }

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;
 
     /**

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);
     }