From ac04cc695cf427b5b7992728a361618a3939400a Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 29 Mar 2024 14:16:14 +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=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comprehensive/AppTrafficSafetyMeetingController.java     | 4 ----
 .../TrafficSecurityManagementAgreementController.java        | 5 +++--
 .../datasource/comprehensive/TrafficSafetyMeetingMapper.xml  | 4 ++++
 .../TrafficSecurityManagementAgreementMapper.xml             | 4 +++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java
index 08be2ab..787e9c4 100644
--- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java
+++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java
@@ -43,10 +43,6 @@ public class AppTrafficSafetyMeetingController extends BaseController {
         if (Tools.notEmpty(MEETING_TITLE))
             pd.put("MEETING_TITLE", MEETING_TITLE.trim());
 
-//        String MEETING_TYPE = pd.getString("MEETING_TYPE"); // 关键词检索条件
-//        if (Tools.notEmpty(MEETING_TYPE))
-//            pd.put("MEETING_TYPE", MEETING_TYPE.trim());
-
         page.setPd(pd);
         List<PageData> varList = trafficSafetyMeetingService.listForSafetyMeeting(page);
         map.put("varList", varList);
diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java
index 8791b34..be8204a 100644
--- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java
+++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java
@@ -59,7 +59,7 @@ public class TrafficSecurityManagementAgreementController extends BaseController
                 map.put("msg", "文件格式不正确！");
                 return map;
             }
-            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            String fileName =file.getOriginalFilename();
             smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
             pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
             pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
@@ -97,7 +97,8 @@ public class TrafficSecurityManagementAgreementController extends BaseController
                 map.put("msg", "文件格式不正确！");
                 return map;
             }
-            String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            //String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            String fileName =file.getOriginalFilename();
             smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile);
             pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName);
             pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME"));
diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml
index 4b6aaf0..7d6abbe 100644
--- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml
+++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyMeetingMapper.xml
@@ -142,13 +142,17 @@
 		from
 		<include refid="tableName"></include> f
 		left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
+		left join bus_traffic_safety_meeting_recipient e on f.SAFETY_MEETING_ID = e.SAFETY_MEETING_ID
 		where f.ISDELETE = '0'
+		AND
+		e.PRACTITIONER = #{pd.USER_ID}
 		<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="getInfo" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml
index 09e7cae..e039c98 100644
--- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml
+++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml
@@ -137,9 +137,11 @@
 
     <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="com.zcloud.entity.PageData">
         select
-        <include refid="Field"></include>
+        <include refid="Field"></include>,
+        i.CORP_NAME
         from
         <include refid="tableName"></include> f
+        left join bus_corp_info i on f.OPERATINGCOMPANY = i.CORPINFO_ID
         where
         f.MANAGEMENTAGREEMENT_ID = #{MANAGEMENTAGREEMENT_ID}
     </select>