feat(AfterSales, TimesheetInfo, BusinessTrip): 添加导出功能支持按ID列表过滤

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmBusinessTripApplyBo.java

@@ -162,5 +162,9 @@ public class CrmBusinessTripApplyBo extends BaseEntity {
      */
     private RemoteFlowInstanceBizExt bizExt;
 
+    /**
+     * 导出时指定的ID列表（逗号分隔）
+     */
+    private String tripIds;
 
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java

@@ -36,7 +36,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.dromara.common.tenant.helper.TenantHelper;
 import cn.hutool.core.convert.Convert;
 
-
 /**
  * 出差申请Service业务层处理
  *
@@ -108,6 +107,9 @@ public class CrmBusinessTripApplyServiceImpl implements ICrmBusinessTripApplySer
                 .selectAs(ErpProjectInfo::getProjectCode, CrmBusinessTripApplyVo::getProjectCode)
                 .leftJoin(ErpProjectInfo.class, ErpProjectInfo::getProjectId, CrmBusinessTripApply::getProjectId)
                 .eq(CrmBusinessTripApply::getDelFlag, "0")
+                // 按指定ID列表过滤（用于导出选中数据）
+                .in(StringUtils.isNotBlank(bo.getTripIds()), CrmBusinessTripApply::getTripId,
+                        StringUtils.isNotBlank(bo.getTripIds()) ? List.of(bo.getTripIds().split(",")) : null)
                 .eq(StringUtils.isNotBlank(bo.getApplyCode()), CrmBusinessTripApply::getApplyCode, bo.getApplyCode())
                 .eq(StringUtils.isNotBlank(bo.getTripType()), CrmBusinessTripApply::getTripType, bo.getTripType())
                 .eq(bo.getApplicantId() != null, CrmBusinessTripApply::getApplicantId, bo.getApplicantId())

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpAfterSalesBo.java

@@ -106,7 +106,8 @@ public class ErpAfterSalesBo extends BaseEntity {
     /**
      * 客户干系人ID（关联客户联系人表）
      */
-//    @NotBlank(message = "客户干系人ID（关联客户联系人表）不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotBlank(message = "客户干系人ID（关联客户联系人表）不能为空", groups = { AddGroup.class,
+    // EditGroup.class })
     private String stakeholderId;
 
     /**
@@ -195,5 +196,9 @@ public class ErpAfterSalesBo extends BaseEntity {
      */
     private RemoteFlowInstanceBizExt bizExt;
 
+    /**
+     * 导出时指定的ID列表（逗号分隔）
+     */
+    private String afterSalesIds;
 
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetInfoBo.java

@@ -92,6 +92,11 @@ public class ErpTimesheetInfoBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 导出时指定的ID列表（逗号分隔）
+     */
+    private String timesheetIds;
+
     /**
      * 子表：部门工作明细
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java

@@ -138,6 +138,10 @@ public class ErpAfterSalesServiceImpl implements IErpAfterSalesService {
         MPJLambdaWrapper<ErpAfterSales> lqw = JoinWrappers.lambda(ErpAfterSales.class)
                 .selectAll(ErpAfterSales.class)
                 .eq(ErpAfterSales::getDelFlag, "0")
+                // 按指定ID列表过滤（用于导出选中数据）
+                .in(StringUtils.isNotBlank(bo.getAfterSalesIds()), ErpAfterSales::getAfterSalesId,
+                        StringUtils.isNotBlank(bo.getAfterSalesIds()) ? List.of(bo.getAfterSalesIds().split(","))
+                                : null)
                 .eq(StringUtils.isNotBlank(bo.getAfterSalesCode()), ErpAfterSales::getAfterSalesCode,
                         bo.getAfterSalesCode())
                 .eq(StringUtils.isNotBlank(bo.getAfterSalesSubject()), ErpAfterSales::getAfterSalesSubject,

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java

@@ -127,12 +127,17 @@ public class ErpTimesheetInfoServiceImpl implements IErpTimesheetInfoService {
         MPJLambdaWrapper<ErpTimesheetInfo> lqw = JoinWrappers.lambda(ErpTimesheetInfo.class)
                 .selectAll(ErpTimesheetInfo.class)
                 .eq(ErpTimesheetInfo::getDelFlag, "0")
+                // 按指定ID列表过滤（用于导出选中数据）
+                .in(StringUtils.isNotBlank(bo.getTimesheetIds()), ErpTimesheetInfo::getTimesheetId,
+                        StringUtils.isNotBlank(bo.getTimesheetIds()) ? List.of(bo.getTimesheetIds().split(",")) : null)
                 .eq(StringUtils.isNotBlank(bo.getTimesheetCode()), ErpTimesheetInfo::getTimesheetCode,
                         bo.getTimesheetCode())
                 .eq(bo.getUserId() != null, ErpTimesheetInfo::getUserId, bo.getUserId())
                 .eq(bo.getDeptId() != null, ErpTimesheetInfo::getDeptId, bo.getDeptId())
-                .eq(bo.getStartTime() != null, ErpTimesheetInfo::getStartTime, bo.getStartTime())
-                .eq(bo.getEndTime() != null, ErpTimesheetInfo::getEndTime, bo.getEndTime())
+                // 日期范围查询：起始时间之后
+                .ge(bo.getStartTime() != null, ErpTimesheetInfo::getStartTime, bo.getStartTime())
+                // 日期范围查询：结束时间之前
+                .le(bo.getEndTime() != null, ErpTimesheetInfo::getEndTime, bo.getEndTime())
                 .eq(bo.getTotalHours() != null, ErpTimesheetInfo::getTotalHours, bo.getTotalHours())
                 .eq(bo.getDeptHours() != null, ErpTimesheetInfo::getDeptHours, bo.getDeptHours())
                 .eq(bo.getProjectHours() != null, ErpTimesheetInfo::getProjectHours, bo.getProjectHours())