From 6ff71d1f1f2c46fec23cbc592b40478c73e08dcf Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 29 Mar 2024 14:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BE=8B=E4=BC=9A=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=87=AA=E5=B7=B1=E5=8F=AF=E5=8F=82=E4=B8=8E?=
 =?UTF-8?q?=E7=9A=84=E4=BC=9A=E8=AE=AE=E4=BC=98=E5=8C=96v2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppTrafficSafetyMeetingController.java     |  2 +-
 .../TrafficSafetyMeetingMapper.java            |  7 ++++++-
 .../TrafficSafetyMeetingService.java           |  1 +
 .../impl/TrafficSafetyMeetingServiceImpl.java  | 10 ++++++++++
 .../TrafficSafetyMeetingMapper.xml             | 18 ++++++++++++++++++
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java
index 787e9c4..971238d 100644
--- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java
+++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java
@@ -44,7 +44,7 @@ public class AppTrafficSafetyMeetingController extends BaseController {
             pd.put("MEETING_TITLE", MEETING_TITLE.trim());
 
         page.setPd(pd);
-        List<PageData> varList = trafficSafetyMeetingService.listForSafetyMeeting(page);
+        List<PageData> varList = trafficSafetyMeetingService.listForSafetyMeetingUser(page);
         map.put("varList", varList);
         map.put("page", page);
         map.put("result", errInfo);
diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java
index a141d82..999e0b1 100644
--- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyMeetingMapper.java
@@ -13,7 +13,12 @@ public interface TrafficSafetyMeetingMapper {
      * @param page
      * @return
      */
-    List<PageData> datalistPage(Page page);
+    List<PageData> datalistPage(Page page);    /**
+     * 列表
+     * @param page
+     * @return
+     */
+    List<PageData> datalistPageUser(Page page);
 
     /**删除
      * @param pd
diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingService.java
index 63ab1d4..f094008 100644
--- a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingService.java
+++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyMeetingService.java
@@ -7,6 +7,7 @@ import java.util.List;
 
 public interface TrafficSafetyMeetingService {
     List<PageData> listForSafetyMeeting(Page page);
+    List<PageData> listForSafetyMeetingUser(Page page);
 
     void delete(PageData pd) throws Exception;
 
diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java
index 64e7efc..1da1bb4 100644
--- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java
+++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyMeetingServiceImpl.java
@@ -26,6 +26,16 @@ public class TrafficSafetyMeetingServiceImpl implements TrafficSafetyMeetingServ
         return trafficSafetyMeetingMapper.datalistPage(page);
     }
 
+    /**
+     * 列表
+     * @param page
+     * @return
+     */
+    @Override
+    public List<PageData> listForSafetyMeetingUser(Page page) {
+        return trafficSafetyMeetingMapper.datalistPageUser(page);
+    }
+
     /**删除
      * @param pd
      * @throws Exception
diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml
index 7d6abbe..891b931 100644
--- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml
+++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml
@@ -136,6 +136,24 @@
 
 	<!--列表-->
 	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		f.*,
+		i.CORP_NAME
+		from
+		<include refid="tableName"></include> f
+		left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
+		where f.ISDELETE = '0'
+		<if test="pd.MEETING_TITLE != null and pd.MEETING_TITLE != ''"><!-- 关键词检索-会议标题 -->
+			and f.MEETING_TITLE like CONCAT('%',#{pd.MEETING_TITLE},'%')
+		</if>
+		<if test="pd.MEETING_TYPE != null and pd.MEETING_TYPE != ''"><!-- 关键词检索-会议类型 -->
+			and f.MEETING_TYPE = #{pd.MEETING_TYPE}
+		</if>
+		ORDER BY f.CREATETIME DESC
+	</select>
+
+	<!--列表-->
+	<select id="datalistPageUser" parameterType="page" resultType="pd">
 		select
 		f.*,
 		i.CORP_NAME