原型修改-时间控件改为开始结束

common/src/main/java/com/lantone/common/vo/GetDictionaryVO.java

@@ -1,4 +1,5 @@
 package com.lantone.common.vo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -6,7 +7,7 @@ import java.io.Serializable;
 
 
 @Data
-public class GetDictionaryVO implements Serializable {
+public class GetDictionaryVO extends Page implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

common/src/main/java/com/lantone/common/vo/GetHospitalSetVO.java

@@ -1,11 +1,12 @@
 package com.lantone.common.vo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 
 
 @Data
-public class GetHospitalSetVO implements Serializable {
+public class GetHospitalSetVO extends Page implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "id")

common/src/main/java/com/lantone/common/vo/GetOperationLogVO.java

@@ -19,9 +19,16 @@ public class GetOperationLogVO extends Page {
     @ApiModelProperty(value = "操作用户")
     String operationName;
     /**
-     * 操作日期
+     * 操作开始时间
      */
-    @ApiModelProperty(value = "操作日期")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    String operationDate;
+    @ApiModelProperty(value = "操作开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
+    String startDate;
+
+    /**
+     * 操作结束时间
+     */
+    @ApiModelProperty(value = "操作结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
+    String endDate;
 }

dblayer-mbg/src/main/resources/mapper/OperationLogMapper.xml

@@ -7,7 +7,6 @@
     </insert>
 
     <select id="getOperationLog" resultType="com.lantone.common.dto.OperationLogDTO">
-
         SELECT
         a.operation_id AS operationId,
         a.operation_name AS operationName,
@@ -26,8 +25,9 @@
         <if test="operationName != null and operationName != ''">
             AND a.operation_name like CONCAT('%',#{operationName},'%')
         </if>
-        <if test="operationDate != null and operationDate != '' ">
-            <![CDATA[ and DATE_FORMAT(a.operation_date,'%Y-%m-%d') = #{operationDate}]]>
+        <if test="startDate != null and endDate != null">
+            <![CDATA[ AND a.operation_date >= #{startDate}]]>
+            <![CDATA[ AND a.operation_date <= #{endDate}]]>
         </if>
     </select>
 </mapper>