From a8bcfa9d1e6a8724ca13b51c3bb161bdd5d10f4c Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 20 Dec 2023 11:13:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=A4=87=E6=A1=88=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=99=8D=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusValcustFilingService.java              | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
index be2172f69f..7e501cab39 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
@@ -216,22 +216,22 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                 PagerVo<BusValcustFilingVo> p = new PagerVo<>();
                 return p;
             }
-            if (StringUtils.isNotBlank(query.getContractNo())) {
-                qw.like("bf.contractNo", query.getContractNo());
-            }
-            if (StringUtils.isNotBlank(query.getCreateByName())) {
-                qw.like("bf.createByName", query.getCreateByName());
-            }
-            if (StringUtils.isNotBlank(query.getModelName())) {
-                qw.like("bf.modelName", query.getModelName());
-            }
-            String createStartTime = query.getCreateStartTime();
-            String createEndTime = query.getCreateEndTime();
-            qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (bf.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-                    apply(StringUtils.isNotBlank(createEndTime), "date_format (bf.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
-                    );
-            qw.orderByDesc("bf.createTime");
         }
+        if (StringUtils.isNotBlank(query.getContractNo())) {
+            qw.like("bf.contractNo", query.getContractNo());
+        }
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("bf.createByName", query.getCreateByName());
+        }
+        if (StringUtils.isNotBlank(query.getModelName())) {
+            qw.like("bf.modelName", query.getModelName());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (bf.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (bf.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        qw.orderByDesc("bf.createTime");
         IPage<BusValcustFiling> page = PagerUtil.queryToPage(pq);
         IPage<BusValcustFilingVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<BusValcustFilingVo> p = PagerUtil.pageToVo(pagging, null);