From f2c5cf5a95abf64b23b6324e5c3f66df0f7a2a3c Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Fri, 12 Jan 2024 09:23:55 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hnac/hzims/safeproduct/dto/ConferenceExportDTO.java  |  8 --------
 .../hzims/safeproduct/mapper/ConferencePlanMapper.xml    | 16 +++++++---------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/ConferenceExportDTO.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/ConferenceExportDTO.java
index 3f3e951..6107a4d 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/ConferenceExportDTO.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/ConferenceExportDTO.java
@@ -45,14 +45,6 @@ public class ConferenceExportDTO {
     @ExcelProperty(value = "主持人", index = 6)
     private String host;
 
-    @ApiModelProperty("会议实际开始时间")
-    @ExcelProperty(value = "会议实际开始时间", index = 7)
-    private Date actualStartTime;
-
-    @ApiModelProperty("会议实际结束时间")
-    @ExcelProperty(value = "会议实际结束时间", index = 8)
-    private Date actualEndTime;
-
     @ApiModelProperty("会议状态")
     @ExcelProperty(value = "会议状态", index = 9)
     private String conferenceStatus;
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml
index b6cd857..8b5f204 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml
@@ -3,23 +3,21 @@
 
     <select id="getConferenceByUnitAndDate" resultType="com.hnac.hzims.safeproduct.dto.ConferenceExportDTO">
         SELECT
-            t1.unit, t1.scheduled_start_time, t1.scheduled_end_time, t1.theme, t1.location, t1.conference_method,
-            t1.host, t2.actual_start_time, t2.actual_end_time, t1.conference_status
+            unit, scheduled_start_time, scheduled_end_time, theme, location, conference_method, host, conference_status
         FROM
-            hzims_conference_plan t1
-            LEFT JOIN hzims_conference_record t2 ON t1.id = t2.conference_plan_id
+            hzims_conference_plan
         WHERE
-            t1.is_deleted = 0
+            is_deleted = 0
         <if test="unit != 'null' and unit != ''">
-            AND t1.unit like concat('%', #{unit}, '%')
+            AND unit like concat('%', #{unit}, '%')
         </if>
         <if test="startTime != 'null' and startTime != ''">
-            AND t1.scheduled_start_time >= #{startTime}
+            AND scheduled_start_time >= #{startTime}
         </if>
         <if test="endTime != 'null' and endTime != ''">
-            AND t1.scheduled_end_time &lt; #{endTime}
+            AND scheduled_end_time &lt; #{endTime}
         </if>
         ORDER BY
-            t1.create_time DESC
+            create_time DESC
     </select>
 </mapper>
\ No newline at end of file