From 943079f32ef27f02174f58130cebe7e7964235a5 Mon Sep 17 00:00:00 2001 From: zhuangdashia Date: Mon, 13 Oct 2025 16:22:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=BB=93=E6=9E=9C=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/MarketingPerformanceHServiceImpl.java | 2 +- .../report/service/impl/MarketingPerformanceMServiceImpl.java | 2 +- .../report/service/impl/MarketingPerformanceMdServiceImpl.java | 2 +- .../report/service/impl/MarketingPerformanceQServiceImpl.java | 2 +- .../report/service/impl/MarketingPerformanceServiceImpl.java | 2 +- .../report/service/impl/MarketingPerformanceYServiceImpl.java | 2 +- .../service/impl/MarketingPricingSummaryMServiceImpl.java | 2 +- .../service/impl/MarketingPricingSummaryQServiceImpl.java | 2 +- .../service/impl/MarketingPricingSummaryYServiceImpl.java | 2 +- .../report/service/impl/MarketingValidInvalidServiceImpl.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceHServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceHServiceImpl.java index 4908ae6..85d8236 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceHServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceHServiceImpl.java @@ -114,7 +114,7 @@ public class MarketingPerformanceHServiceImpl implements IMarketingPerformanceHS private LambdaQueryWrapper buildQueryWrapper(MarketingPerformanceHBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MarketingPerformanceH::getRecordDate); + lqw.orderByDesc(MarketingPerformanceH::getRecordDate); lqw.like(StringUtils.isNotBlank(bo.getBranchName()), MarketingPerformanceH::getBranchName, bo.getBranchName()); lqw.eq(StringUtils.isNotBlank(bo.getBranchId()), MarketingPerformanceH::getBranchId, bo.getBranchId()); lqw.like(StringUtils.isNotBlank(bo.getMarketerName()), MarketingPerformanceH::getMarketerName, bo.getMarketerName()); diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceMServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceMServiceImpl.java index ab3cb7b..5ef5229 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceMServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceMServiceImpl.java @@ -127,7 +127,7 @@ public class MarketingPerformanceMServiceImpl implements IMarketingPerformanceMS private LambdaQueryWrapper buildQueryWrapper(MarketingPerformanceMBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MarketingPerformanceM::getRecordDate); + lqw.orderByDesc(MarketingPerformanceM::getRecordDate); lqw.like(StringUtils.isNotBlank(bo.getBranchName()), MarketingPerformanceM::getBranchName, bo.getBranchName()); lqw.eq(StringUtils.isNotBlank(bo.getBranchId()), MarketingPerformanceM::getBranchId, bo.getBranchId()); lqw.like(StringUtils.isNotBlank(bo.getMarketerName()), MarketingPerformanceM::getMarketerName, bo.getMarketerName()); diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceMdServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceMdServiceImpl.java index 7bea6aa..09ebeea 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceMdServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceMdServiceImpl.java @@ -113,7 +113,7 @@ public class MarketingPerformanceMdServiceImpl implements IMarketingPerformanceM private LambdaQueryWrapper buildQueryWrapper(MarketingPerformanceMdBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MarketingPerformanceMd::getRecordDate); + lqw.orderByDesc(MarketingPerformanceMd::getRecordDate); lqw.like(StringUtils.isNotBlank(bo.getBranchName()), MarketingPerformanceMd::getBranchName, bo.getBranchName()); lqw.eq(StringUtils.isNotBlank(bo.getBranchId()), MarketingPerformanceMd::getBranchId, bo.getBranchId()); lqw.like(StringUtils.isNotBlank(bo.getMarketerName()), MarketingPerformanceMd::getMarketerName, bo.getMarketerName()); diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceQServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceQServiceImpl.java index 33773dc..ff50767 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceQServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceQServiceImpl.java @@ -127,7 +127,7 @@ public class MarketingPerformanceQServiceImpl implements IMarketingPerformanceQS private LambdaQueryWrapper buildQueryWrapper(MarketingPerformanceQBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MarketingPerformanceQ::getRecordDate); + lqw.orderByDesc(MarketingPerformanceQ::getRecordDate); lqw.like(StringUtils.isNotBlank(bo.getBranchName()), MarketingPerformanceQ::getBranchName, bo.getBranchName()); lqw.eq(StringUtils.isNotBlank(bo.getBranchId()), MarketingPerformanceQ::getBranchId, bo.getBranchId()); lqw.like(StringUtils.isNotBlank(bo.getMarketerName()), MarketingPerformanceQ::getMarketerName, bo.getMarketerName()); diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceServiceImpl.java index c5499d7..d202ee6 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceServiceImpl.java @@ -130,7 +130,7 @@ public class MarketingPerformanceServiceImpl implements IMarketingPerformanceSer private LambdaQueryWrapper buildQueryWrapper(MarketingPerformanceBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MarketingPerformance::getRecordDate); + lqw.orderByDesc(MarketingPerformance::getRecordDate); lqw.like(StringUtils.isNotBlank(bo.getBranchName()), MarketingPerformance::getBranchName, bo.getBranchName()); lqw.eq(StringUtils.isNotBlank(bo.getBranchId()), MarketingPerformance::getBranchId, bo.getBranchId()); lqw.like(StringUtils.isNotBlank(bo.getMarketerName()), MarketingPerformance::getMarketerName, bo.getMarketerName()); diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceYServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceYServiceImpl.java index 093dc97..fc9ace2 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceYServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPerformanceYServiceImpl.java @@ -127,7 +127,7 @@ public class MarketingPerformanceYServiceImpl implements IMarketingPerformanceYS private LambdaQueryWrapper buildQueryWrapper(MarketingPerformanceYBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MarketingPerformanceY::getRecordDate); + lqw.orderByDesc(MarketingPerformanceY::getRecordDate); lqw.like(StringUtils.isNotBlank(bo.getBranchName()), MarketingPerformanceY::getBranchName, bo.getBranchName()); lqw.eq(StringUtils.isNotBlank(bo.getBranchId()), MarketingPerformanceY::getBranchId, bo.getBranchId()); lqw.like(StringUtils.isNotBlank(bo.getMarketerName()), MarketingPerformanceY::getMarketerName, bo.getMarketerName()); diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryMServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryMServiceImpl.java index ae0e10f..84fe593 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryMServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryMServiceImpl.java @@ -127,7 +127,7 @@ public class MarketingPricingSummaryMServiceImpl implements IMarketingPricingSum private LambdaQueryWrapper buildQueryWrapper(MarketingPricingSummaryMBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MarketingPricingSummaryM::getRecordDate); + lqw.orderByDesc(MarketingPricingSummaryM::getRecordDate); lqw.like(StringUtils.isNotBlank(bo.getBranchName()), MarketingPricingSummaryM::getBranchName, bo.getBranchName()); lqw.eq(StringUtils.isNotBlank(bo.getBranchId()), MarketingPricingSummaryM::getBranchId, bo.getBranchId()); lqw.like(StringUtils.isNotBlank(bo.getEmployeeName()), MarketingPricingSummaryM::getEmployeeName, bo.getEmployeeName()); diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryQServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryQServiceImpl.java index ac4ddeb..f84f7e9 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryQServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryQServiceImpl.java @@ -127,7 +127,7 @@ public class MarketingPricingSummaryQServiceImpl implements IMarketingPricingSum private LambdaQueryWrapper buildQueryWrapper(MarketingPricingSummaryQBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MarketingPricingSummaryQ::getRecordDate); + lqw.orderByDesc(MarketingPricingSummaryQ::getRecordDate); lqw.like(StringUtils.isNotBlank(bo.getBranchName()), MarketingPricingSummaryQ::getBranchName, bo.getBranchName()); lqw.eq(StringUtils.isNotBlank(bo.getBranchId()), MarketingPricingSummaryQ::getBranchId, bo.getBranchId()); lqw.like(StringUtils.isNotBlank(bo.getEmployeeName()), MarketingPricingSummaryQ::getEmployeeName, bo.getEmployeeName()); diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryYServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryYServiceImpl.java index a8ecaf7..12c2845 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryYServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingPricingSummaryYServiceImpl.java @@ -127,7 +127,7 @@ public class MarketingPricingSummaryYServiceImpl implements IMarketingPricingSum private LambdaQueryWrapper buildQueryWrapper(MarketingPricingSummaryYBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MarketingPricingSummaryY::getRecordDate); + lqw.orderByDesc(MarketingPricingSummaryY::getRecordDate); lqw.like(StringUtils.isNotBlank(bo.getBranchName()), MarketingPricingSummaryY::getBranchName, bo.getBranchName()); lqw.eq(StringUtils.isNotBlank(bo.getBranchId()), MarketingPricingSummaryY::getBranchId, bo.getBranchId()); lqw.like(StringUtils.isNotBlank(bo.getEmployeeName()), MarketingPricingSummaryY::getEmployeeName, bo.getEmployeeName()); diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingValidInvalidServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingValidInvalidServiceImpl.java index 678929f..fe5bba3 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingValidInvalidServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/service/impl/MarketingValidInvalidServiceImpl.java @@ -127,7 +127,7 @@ public class MarketingValidInvalidServiceImpl implements IMarketingValidInvalidS private LambdaQueryWrapper buildQueryWrapper(MarketingValidInvalidBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MarketingValidInvalid::getRecordMonth); + lqw.orderByDesc(MarketingValidInvalid::getRecordMonth); lqw.like(StringUtils.isNotBlank(bo.getBranchName()), MarketingValidInvalid::getBranchName, bo.getBranchName()); lqw.like(StringUtils.isNotBlank(bo.getEmployeeName()), MarketingValidInvalid::getEmployeeName, bo.getEmployeeName()); lqw.eq(StringUtils.isNotBlank(bo.getMarketingCode()), MarketingValidInvalid::getMarketingCode, bo.getMarketingCode());