Sfoglia il codice sorgente

审计日志列表筛选逻辑、时间格式修正

2643616413 1 giorno fa
parent
commit
b7a654ad89

+ 2 - 0
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/vo/AitagApiLogListVo.java

@@ -1,5 +1,6 @@
 package cn.com.yusys.yusp.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,5 +24,6 @@ public class AitagApiLogListVo {
     private String operationType;
 
     @ApiModelProperty("操作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createDate;
 }

+ 2 - 4
server/yusp-tagging-core/src/main/resources/mapper/AitagApiLogMapper.xml

@@ -43,8 +43,7 @@
                 AND create_date >= #{startTime}
             </if>
             <if test="endTime != null">
-                <!-- 结束时间加一天,确保包含当天的所有记录 -->
-                AND create_date <![CDATA[<]]> DATE_ADD(#{endTime}, INTERVAL 1 DAY)
+                AND DATE(create_date) <![CDATA[<=]]> DATE(#{endTime})
             </if>
         </where>
     </select>
@@ -58,8 +57,7 @@
                 AND create_date >= #{startTime}
             </if>
             <if test="endTime != null">
-                <!-- 结束时间加一天,确保包含当天的所有记录 -->
-                AND create_date <![CDATA[<]]> DATE_ADD(#{endTime}, INTERVAL 1 DAY)
+                AND DATE(create_date) <![CDATA[<=]]> DATE(#{endTime})
             </if>
         </where>
         ORDER BY create_date DESC