提交 ad525bc6 作者: 张开石

1、获取纪要模板列表接口,修改bug

父级 b44968b6
...@@ -7,7 +7,9 @@ import com.cmeeting.pojo.MeetingRecordTemplate; ...@@ -7,7 +7,9 @@ import com.cmeeting.pojo.MeetingRecordTemplate;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
import java.util.List; import java.util.List;
...@@ -46,8 +48,8 @@ public interface MeetingRecordTemplateMapper extends BaseMapper<MeetingRecordTem ...@@ -46,8 +48,8 @@ public interface MeetingRecordTemplateMapper extends BaseMapper<MeetingRecordTem
@Param("name") String name, @Param("name") String name,
@Param("meetingType") String meetingType, @Param("meetingType") String meetingType,
@Param("createUser") String createUser, @Param("createUser") String createUser,
@Param("startTime") LocalDateTime startTime, @Param("startTime") Date startTime,
@Param("endTime") LocalDateTime endTime); @Param("endTime") Date endTime);
......
...@@ -7,7 +7,9 @@ import lombok.Data; ...@@ -7,7 +7,9 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -59,16 +61,12 @@ public class RecordTemplateVO { ...@@ -59,16 +61,12 @@ public class RecordTemplateVO {
/** /**
* 时间查询条件开始 * 时间查询条件开始
*/ */
@DateTimeFormat(pattern = "yyy-MM-dd HH:mm:ss") private Date startTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
private LocalDateTime startTime;
/** /**
* 时间查询条件结束 * 时间查询条件结束
*/ */
@DateTimeFormat(pattern = "yyy-MM-dd HH:mm:ss") private Date endTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
private LocalDateTime endTime;
@Data @Data
public static class TemplatePermissionVO{ public static class TemplatePermissionVO{
......
...@@ -206,8 +206,8 @@ ...@@ -206,8 +206,8 @@
<if test="type != null and type != ''">and cmt_meeting_record_template.type = #{type}</if> <if test="type != null and type != ''">and cmt_meeting_record_template.type = #{type}</if>
<if test="meetingType != null and meetingType != ''">and meet_type.name like concat('%', #{meetingType}, '%')</if> <if test="meetingType != null and meetingType != ''">and meet_type.name like concat('%', #{meetingType}, '%')</if>
<if test="createUser != null and createUser != ''">and (cmt_meeting_record_template.create_user like concat('%', #{createUser}, '%') or cmt_meeting_record_template.create_user_name like concat('%', #{createUser}, '%') )</if> <if test="createUser != null and createUser != ''">and (cmt_meeting_record_template.create_user like concat('%', #{createUser}, '%') or cmt_meeting_record_template.create_user_name like concat('%', #{createUser}, '%') )</if>
<if test="startTime != null">and cmt_meeting_record_template.update_time &gt;= date_format(#{startTime}, '%Y-%m-%d')</if> <if test="startTime != null">and date_format(cmt_meeting_record_template.update_time, '%Y-%m-%d') &gt;= date_format(#{startTime}, '%Y-%m-%d')</if>
<if test="endTime != null">and cmt_meeting_record_template.update_time &lt;= date_format(#{endTime}, '%Y-%m-%d')</if> <if test="endTime != null">and date_format(cmt_meeting_record_template.update_time, '%Y-%m-%d') &lt;= date_format(#{endTime}, '%Y-%m-%d')</if>
</where> </where>
</select> </select>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论