From ee160fccf891b2909bd8fde0f81295e1dba7f2c9 Mon Sep 17 00:00:00 2001 From: Yangk Date: Tue, 13 Jan 2026 17:44:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=9B=B4=E6=96=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=92=8C=E6=8E=92=E5=BA=8F=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改出差申请查询条件，开始时间改为大于等于匹配，结束时间改为小于等于匹配 - 为出差申请、项目售后管理和服务时间表查询添加按创建时间降序排序 --- .../crm/service/impl/CrmBusinessTripApplyServiceImpl.java | 7 ++++--- .../oa/erp/service/impl/ErpAfterSalesServiceImpl.java | 3 ++- .../oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java index ca86424d..aa0d64b9 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java +++ b/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; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java index a1b9d4ef..8d2983e5 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java +++ b/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; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java index db6211a4..7a9fe3c3 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java +++ b/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; }