update: 会议管理模块

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;

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,
+            unit, scheduled_start_time, scheduled_end_time, theme, location, conference_method, host, conference_status
-            t1.host, t2.actual_start_time, t2.actual_end_time, t1.conference_status
         FROM
-            hzims_conference_plan t1
+            hzims_conference_plan
-            LEFT JOIN hzims_conference_record t2 ON t1.id = t2.conference_plan_id
         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>