Browse Source

【修改】弹框日志列表导出加入操作时间

lichen 2 tuần trước cách đây
mục cha
commit
b15979299b

+ 1 - 1
suishenbang-admin/src/main/resources/templates/system/upvoteLog/upvoteLog.html

@@ -178,7 +178,7 @@
                     title : '销售部'
                 },
                 {
-                    field : 'updateTime',
+                    field : 'updateTimeStr',
                     title : '操作时间'
                 },
                 {

+ 3 - 0
suishenbang-system/src/main/java/com/dgtly/system/domain/AlertUpvoteLog.java

@@ -1,5 +1,6 @@
 package com.dgtly.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -63,6 +64,8 @@ public class AlertUpvoteLog extends BaseEntity
     /** 销售部 */
     @Excel(name = "销售部")
     private String subOfficeName;
+    @Excel(name = "操作时间")
+    private String updateTimeStr;
     /** 级别 */
     private String salesLevel;
 

+ 1 - 1
suishenbang-system/src/main/resources/mapper/system/AlertUpvoteLogMapper.xml

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select alert_upvote_id as alertUpvoteId,
                alert_id as alertId,
                create_time as createTime,
-               update_time as updateTime,
+               DATE_FORMAT(update_time, '%Y-%m-%d %H:%i:%s') as updateTimeStr,
                user_id as userId,
                status as status,
                login_name as loginName,