From c502eb42fd246327a3874607d367b9aa296338a6 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Wed, 24 Dec 2025 16:13:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(service):=20=E6=B7=BB=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E6=8C=89=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E9=99=8D=E5=BA=8F=E6=8E=92=E5=88=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在CrmMailingApplyServiceImpl中添加创建时间降序排序 - 在CrmQuoteInfoServiceImpl中添加创建时间降序排序 - 在ErpProjectAcceptanceServiceImpl中添加创建时间降序排序 - 在ErpProjectReceivingServiceImpl中添加创建时间降序排序 --- .../oa/crm/service/impl/CrmMailingApplyServiceImpl.java | 4 +++- .../dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java | 3 ++- .../oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java | 2 ++ .../oa/erp/service/impl/ErpProjectReceivingServiceImpl.java | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmMailingApplyServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmMailingApplyServiceImpl.java index 06c9f735..280e48f6 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmMailingApplyServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmMailingApplyServiceImpl.java @@ -112,7 +112,9 @@ public class CrmMailingApplyServiceImpl implements ICrmMailingApplyService { .eq(StringUtils.isNotBlank(bo.getFlowStatus()), CrmMailingApply::getFlowStatus, bo.getFlowStatus()) .eq(StringUtils.isNotBlank(bo.getLogisticsStatus()), CrmMailingApply::getLogisticsStatus, bo.getLogisticsStatus()) .eq(bo.getMailingTime() != null, CrmMailingApply::getMailingTime, bo.getMailingTime()) - .eq(bo.getSignTime() != null, CrmMailingApply::getSignTime, bo.getSignTime()); + .eq(bo.getSignTime() != null, CrmMailingApply::getSignTime, bo.getSignTime()) + // 按创建时间降序排列 + .orderByDesc(CrmMailingApply::getCreateTime); return lqw; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java index 9421f4a4..ecd6c3b7 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmQuoteInfoServiceImpl.java @@ -175,7 +175,8 @@ public class CrmQuoteInfoServiceImpl implements ICrmQuoteInfoService { .eq(StringUtils.isNotBlank(bo.getOssId()), CrmQuoteInfo::getOssId, bo.getOssId()) .eq(StringUtils.isNotBlank(bo.getQuoteStatus()), CrmQuoteInfo::getQuoteStatus, bo.getQuoteStatus()) .eq(StringUtils.isNotBlank(bo.getFlowStatus()), CrmQuoteInfo::getFlowStatus, bo.getFlowStatus()) -; + // 按创建时间降序排列 + .orderByDesc(CrmQuoteInfo::getCreateTime); return lqw; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java index 0413a29b..d5c1cd50 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java @@ -117,6 +117,8 @@ public class ErpProjectAcceptanceServiceImpl implements IErpProjectAcceptanceSer lqw.ge(StringUtils.isNotBlank(beginTime), ErpProjectAcceptance::getAcceptanceDate, beginTime) .le(StringUtils.isNotBlank(endTime), ErpProjectAcceptance::getAcceptanceDate, endTime); } + // 按创建时间降序排列 + lqw.orderByDesc(ErpProjectAcceptance::getCreateTime); return lqw; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java index db965346..3b759843 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java @@ -113,6 +113,8 @@ public class ErpProjectReceivingServiceImpl implements IErpProjectReceivingServi lqw.ge(StringUtils.isNotBlank(beginTime), ErpProjectReceiving::getArrivalDate, beginTime) .le(StringUtils.isNotBlank(endTime), ErpProjectReceiving::getArrivalDate, endTime); } + // 按创建时间降序排列 + lqw.orderByDesc(ErpProjectReceiving::getCreateTime); return lqw; }