feat(oa): 更新查询条件和排序逻辑

- 修改出差申请查询条件，开始时间改为大于等于匹配，结束时间改为小于等于匹配
- 为出差申请、项目售后管理和服务时间表查询添加按创建时间降序排序

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

@@ -119,8 +119,8 @@ public class CrmBusinessTripApplyServiceImpl implements ICrmBusinessTripApplySer
                 .like(StringUtils.isNotBlank(bo.getDeptName()), CrmBusinessTripApply::getDeptName, bo.getDeptName())
                 .eq(StringUtils.isNotBlank(bo.getTripLocation()), CrmBusinessTripApply::getTripLocation,
                         bo.getTripLocation())
-                .eq(bo.getStartTime() != null, CrmBusinessTripApply::getStartTime, bo.getStartTime())
-                .eq(bo.getEndTime() != null, CrmBusinessTripApply::getEndTime, bo.getEndTime())
+                .ge(bo.getStartTime() != null, CrmBusinessTripApply::getStartTime, bo.getStartTime())
+                .le(bo.getEndTime() != null, CrmBusinessTripApply::getEndTime, bo.getEndTime())
                 .eq(bo.getDurationDays() != null, CrmBusinessTripApply::getDurationDays, bo.getDurationDays())
                 .eq(StringUtils.isNotBlank(bo.getTripReason()), CrmBusinessTripApply::getTripReason, bo.getTripReason())
                 .eq(bo.getProjectId() != null, CrmBusinessTripApply::getProjectId, bo.getProjectId())
@@ -138,7 +138,8 @@ public class CrmBusinessTripApplyServiceImpl implements ICrmBusinessTripApplySer
                 .eq(StringUtils.isNotBlank(bo.getFeedback()), CrmBusinessTripApply::getFeedback, bo.getFeedback())
                 .eq(StringUtils.isNotBlank(bo.getTripStatus()), CrmBusinessTripApply::getTripStatus, bo.getTripStatus())
                 .eq(StringUtils.isNotBlank(bo.getFlowStatus()), CrmBusinessTripApply::getFlowStatus, bo.getFlowStatus())
-                .eq(StringUtils.isNotBlank(bo.getOssId()), CrmBusinessTripApply::getOssId, bo.getOssId());
+                .eq(StringUtils.isNotBlank(bo.getOssId()), CrmBusinessTripApply::getOssId, bo.getOssId())
+                .orderByDesc(CrmBusinessTripApply::getCreateTime);
         return lqw;
     }
 

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

@@ -174,7 +174,8 @@ public class ErpAfterSalesServiceImpl implements IErpAfterSalesService {
                 .eq(StringUtils.isNotBlank(bo.getAfterSalesStatus()), ErpAfterSales::getAfterSalesStatus,
                         bo.getAfterSalesStatus())
                 .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpAfterSales::getFlowStatus, bo.getFlowStatus())
-                .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpAfterSales::getActiveFlag, bo.getActiveFlag());
+                .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpAfterSales::getActiveFlag, bo.getActiveFlag())
+                .orderByDesc(ErpAfterSales::getCreateTime);
         return lqw;
     }
 

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

@@ -143,7 +143,8 @@ public class ErpTimesheetInfoServiceImpl implements IErpTimesheetInfoService {
                 .eq(bo.getProjectHours() != null, ErpTimesheetInfo::getProjectHours, bo.getProjectHours())
                 .eq(StringUtils.isNotBlank(bo.getTimesheetStatus()), ErpTimesheetInfo::getTimesheetStatus,
                         bo.getTimesheetStatus())
-                .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpTimesheetInfo::getFlowStatus, bo.getFlowStatus());
+                .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpTimesheetInfo::getFlowStatus, bo.getFlowStatus())
+                .orderByDesc(ErpTimesheetInfo::getCreateTime);
         return lqw;
     }