From 6c71ded466bda1d0772f2eb5518a1717e4232d4a Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 28 May 2024 10:24:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsBusreserveBillMapper.xml                |  6 ++-
 .../AsBusreserveBillService.java              | 38 +++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
index 329392d9dd..ee6e1fa5e5 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
@@ -4,7 +4,11 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
-		SELECT * FROM as_busreserve_bill <where> ${ew.sqlSegment} </where>
+		SELECT a.* FROM as_busreserve_bill as a
+		left join anrui_portal.sys_organization as s on a.createDeptSid = s.sid
+		 <where>
+		    ${ew.sqlSegment}
+		 </where>
 	</select>
 
 	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
index c2a7282424..23445b66c3 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
@@ -131,18 +131,18 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
                 String orgLevelKey = defaultIdReltBean.getData();
                 if ("1".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i1);
-                    qw.like("orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
                 } else if ("2".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i2);
-                    qw.like("orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
                 } else if ("3".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i3);
-                    qw.like("orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
                 } else if ("4".equals(orgLevelKey)) {
                     orgSidPath = orgSidPath.substring(0, i4);
-                    qw.like("orgSidPath", orgSidPath);
+                    qw.like("s.orgSidPath", orgSidPath);
                 } else if ("5".equals(orgLevelKey)) {
-                    qw.eq("createBySid", query.getUserSid());
+                    qw.eq("a.createBySid", query.getUserSid());
                 } else {
                     PagerVo<AsBusreserveBillVo> p = new PagerVo<>();
                     return p;
@@ -154,46 +154,46 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
         }
 
         if (StringUtils.isNotBlank(query.getState())) {
-            qw.eq("state", query.getState());
+            qw.eq("a.state", query.getState());
         }
         if (StringUtils.isNotBlank(query.getUseOrgName())) {
-            qw.like("useOrgName", query.getUseOrgName());
+            qw.like("a.useOrgName", query.getUseOrgName());
         }
         if (StringUtils.isNotBlank(query.getWaitorName())) {
-            qw.like("waitorName", query.getWaitorName());
+            qw.like("a.waitorName", query.getWaitorName());
         }
         if (StringUtils.isNotBlank(query.getCreateDept())) {
-            qw.like("createDept", query.getCreateDept());
+            qw.like("a.createDept", query.getCreateDept());
         }
         if (StringUtils.isNotBlank(query.getCreateByName())) {
-            qw.like("createByName", query.getCreateByName());
+            qw.like("a.createByName", query.getCreateByName());
         }
         if (StringUtils.isNotBlank(query.getBillNo())) {
-            qw.like("billNo", query.getBillNo());
+            qw.like("a.billNo", query.getBillNo());
         }
 
         if (StringUtils.isNotBlank(query.getCustomerName())) {
-            qw.like("customerName", query.getCustomerName());
+            qw.like("a.customerName", query.getCustomerName());
         }
         if (StringUtils.isNotBlank(query.getVehMark())) {
-            qw.like("vehMark", query.getVehMark());
+            qw.like("a.vehMark", query.getVehMark());
         }
 
         if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.like("vinNo", query.getVinNo());
+            qw.like("a.vinNo", query.getVinNo());
         }
         if (StringUtils.isNotBlank(query.getMobile())) {
-            qw.like("mobile", query.getMobile());
+            qw.like("a.mobile", query.getMobile());
         }
         String createStartTime = query.getStartCreateDate();
         String createEndTime = query.getEndCreateDate();
-        qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(createEndTime), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
         String startDate = query.getStartDate();
         String endDate = query.getEndDate();
-        qw.apply(StringUtils.isNotEmpty(startDate), "date_format (reserveStart,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(endDate), "date_format (reserveStart,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(startDate), "date_format (a.reserveStart,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(endDate), "date_format (a.reserveStart,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"
                 );
         IPage<AsBusreserveBill> page = PagerUtil.queryToPage(pq);
         IPage<AsBusreserveBillVo> pagging = baseMapper.selectPageVo(page, qw);