From 340dd6237e488b6b4e88bad2c653be2cfc7ffd38 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 22 Jan 2025 14:35:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E8=AE=A1=E5=88=92=E5=8D=87?= =?UTF-8?q?=E5=BA=8F=E6=94=B9=E4=B8=BA=E9=99=8D=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/gather/device/service/impl/PqDevServiceImpl.java | 2 +- .../njcn/gather/err/service/impl/PqErrSysServiceImpl.java | 2 +- .../com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java | 5 ++--- .../njcn/gather/source/service/impl/PqSourceServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java index 7ff740d4..68c16556 100644 --- a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java @@ -486,7 +486,7 @@ public class PqDevServiceImpl extends ServiceImpl implements queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy())); } } - queryWrapper.eq("pq_dev.state", DataStateEnum.ENABLE.getCode()).orderBy(true, true, "pq_dev.Create_Time"); + queryWrapper.eq("pq_dev.state", DataStateEnum.ENABLE.getCode()).orderBy(true, false, "pq_dev.Create_Time"); return queryWrapper; } diff --git a/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysServiceImpl.java b/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysServiceImpl.java index 5409b403..85d33e1f 100644 --- a/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysServiceImpl.java @@ -50,7 +50,7 @@ public class PqErrSysServiceImpl extends ServiceImpl i if (ObjectUtil.isNotNull(param)) { queryWrapper.between(ObjectUtil.isNotEmpty(param.getStandardTime()), "pq_err_sys.Standard_Time", param.getStandardTime() + "-01-01", param.getStandardTime() + "-12-31").eq(ObjectUtil.isNotEmpty(param.getDevLevel()), "pq_err_sys.Dev_Level", param.getDevLevel()); } - queryWrapper.eq("pq_err_sys.state", DataStateEnum.ENABLE.getCode()); + queryWrapper.eq("pq_err_sys.state", DataStateEnum.ENABLE.getCode()).orderByDesc("pq_err_sys.Create_Time"); return this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper); } diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index 48cca404..cefc6e05 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -287,10 +287,9 @@ public class AdPlanServiceImpl extends ServiceImpl impleme .eq(StrUtil.isNotBlank(queryParam.getName()), "ad_plan.name", queryParam.getName()) .eq(ObjectUtil.isNotNull(queryParam.getTestState()), "ad_plan.Test_State", queryParam.getTestState()) .eq(ObjectUtil.isNotNull(queryParam.getReportState()), "ad_plan.Report_State", queryParam.getReportState()) - .eq(ObjectUtil.isNotNull(queryParam.getResult()), "ad_plan.result", queryParam.getResult()) - .orderByDesc("Create_Time"); + .eq(ObjectUtil.isNotNull(queryParam.getResult()), "ad_plan.result", queryParam.getResult()); } - queryWrapper.eq("ad_plan.state", DataStateEnum.ENABLE.getCode()).orderBy(true, true, "Create_Time"); + queryWrapper.eq("ad_plan.state", DataStateEnum.ENABLE.getCode()).orderByDesc("Create_Time"); return queryWrapper; } diff --git a/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java b/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java index c75f4099..efad0488 100644 --- a/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java @@ -53,7 +53,7 @@ public class PqSourceServiceImpl extends ServiceImpl i .eq(StrUtil.isNotBlank(param.getType()), "pq_source.type", param.getType()) .eq(StrUtil.isNotBlank(param.getDevType()), "pq_source.Dev_Type", param.getDevType()); } - queryWrapper.eq("pq_source.state", DataStateEnum.ENABLE.getCode()); + queryWrapper.eq("pq_source.state", DataStateEnum.ENABLE.getCode()).orderByAsc("pq_source.Create_Time"); return this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper); }