From 6f2747c7e3b41402654bdeecd15f338ea5faf9a0 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 17 May 2024 11:36:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E7=A7=8D=E7=9A=84=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/XzBlindPlatePlugSafeServiceImpl.java | 4 ---- .../xz/special/service/impl/XzGroundSafetServiceImpl.java | 5 +---- .../xz/special/service/impl/XzHighJobSafeServiceImpl.java | 5 +---- .../special/service/impl/XzHoistSafetyWorkServiceImpl.java | 5 +---- .../xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java | 5 +---- .../special/service/impl/XzOpenCircuitSafeServiceImpl.java | 5 +---- .../impl/XzSpecialOperationFireSafetyServiceImpl.java | 5 +---- .../service/impl/XzTemporaryElectricitySafeServiceImpl.java | 5 +---- 8 files changed, 7 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java index 6e1c950f9..d93136a15 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java @@ -55,10 +55,6 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzBlindPlatePlugSafe.class, paramMap, alias); - String firemanName = MapUtils.getString(paramMap, "firemanName"); - if (StrUtil.isNotBlank(firemanName)) { - queryWrapper.like("wi1.worker_name", firemanName); - } queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzBlindPlatePlugSafe::getJobApplicationTime)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java index ea6a69948..90ce47308 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java @@ -55,10 +55,7 @@ public class XzGroundSafetServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzGroundSafet.class, paramMap, alias); - String firemanName = MapUtils.getString(paramMap, "firemanName"); - if (StrUtil.isNotBlank(firemanName)) { - queryWrapper.like("wi1.worker_name", firemanName); - } + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzGroundSafet::getJobApplicationTime)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java index 3fb63defa..9194fd59d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java @@ -55,10 +55,7 @@ public class XzHighJobSafeServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzHighJobSafe.class, paramMap, alias); - String firemanName = MapUtils.getString(paramMap, "firemanName"); - if (StrUtil.isNotBlank(firemanName)) { - queryWrapper.like("wi1.worker_name", firemanName); - } + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzHighJobSafe::getJobApplicationTime)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java index a614e07a9..1e7fa1bb6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java @@ -55,10 +55,7 @@ public class XzHoistSafetyWorkServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzHoistSafetyWork.class, paramMap, alias); - String firemanName = MapUtils.getString(paramMap, "firemanName"); - if (StrUtil.isNotBlank(firemanName)) { - queryWrapper.like("wi1.worker_name", firemanName); - } + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzHoistSafetyWork::getJobApplicationTime)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java index 3747da0a0..2728b7b87 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java @@ -55,10 +55,7 @@ public class XzLimitSpaceSafeServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzLimitSpaceSafe.class, paramMap, alias); - String firemanName = MapUtils.getString(paramMap, "firemanName"); - if (StrUtil.isNotBlank(firemanName)) { - queryWrapper.like("wi1.worker_name", firemanName); - } + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzLimitSpaceSafe::getJobApplicationTime)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java index ab0ee9390..5db248b33 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java @@ -55,10 +55,7 @@ public class XzOpenCircuitSafeServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzOpenCircuitSafe.class, paramMap, alias); - String firemanName = MapUtils.getString(paramMap, "firemanName"); - if (StrUtil.isNotBlank(firemanName)) { - queryWrapper.like("wi1.worker_name", firemanName); - } + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzOpenCircuitSafe::getJobApplicationTime)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java index 7559caf14..e4d17e238 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java @@ -59,10 +59,7 @@ public class XzSpecialOperationFireSafetyServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzSpecialOperationFireSafety.class, paramMap, alias); - String firemanName = MapUtils.getString(paramMap, "firemanName"); - if (StrUtil.isNotBlank(firemanName)) { - queryWrapper.like("wi1.worker_name", firemanName); - } + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzSpecialOperationFireSafety::getJobApplicationTime)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java index e70446d41..8f806d568 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java @@ -55,10 +55,7 @@ public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "t."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzTemporaryElectricitySafe.class, paramMap, alias); - String firemanName = MapUtils.getString(paramMap, "firemanName"); - if (StrUtil.isNotBlank(firemanName)) { - queryWrapper.like("wi1.worker_name", firemanName); - } + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTemporaryElectricitySafe::getJobApplicationTime)); return queryWrapper; }