显示回复列表修改

whepi-ui/templates/home/htlpXq.ftl

@@ -34,6 +34,7 @@
             <a class="weui-btn weui-btn_default" href="javascript:doTask();">回复</a>
             <a class="weui-btn weui-btn_primary" href="javascript:commint();">完成</a>
         </div>
+            <p class="weui-media-box__desc" style="margin-top: 3vh;">回复列表：</p>
             <div id="qz_doing_detail" style="margin-top: 3vh;"></div>
         </#if>
         <#if task.taskStatus == 3>
@@ -41,6 +42,7 @@
                  style="margin-bottom: 3vh; display: flex; justify-content: center; height: 5vh; line-height: 5vh">
                 <h4 class="weui-media-box__title">已完成</h4>
             </div>
+            <p class="weui-media-box__desc" style="margin-top: 3vh;">回复列表：</p>
             <div id="qz_done_detail"></div>
         </#if>
     </div>
@@ -144,14 +146,14 @@
                 if (task.taskStatus == 2) {
                     for (let i = 0; i < data.data.length; i++) {
                         let reply = data.data[i];
-                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '&emsp;' + timestampToTime(reply.timeUpdate) + '&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;回复</p>\n' +
+                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '&emsp;' + reply.timeUpdate + '</p>\n' +
                                 '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
                     }
                 }
                 else if (task.taskStatus == 3) {
                     for (let i = 0; i < data.data.length; i++) {
                         let reply = data.data[i];
-                        $("#qz_done_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '&emsp;' + timestampToTime(reply.timeUpdate) + '&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;回复</p>\n' +
+                        $("#qz_done_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '&emsp;' + reply.timeUpdate + '</p>\n' +
                                 '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
                     }
                 }

whepi-ui/templates/yeweihui/qiuzhuDetail.ftl

@@ -24,20 +24,18 @@
             </div>
         </#if>
         <#if task.taskStatus == 2>
-            <div class="weui-btn_primary" style="margin-bottom: 3vh; display: flex; justify-content: center; height: 5vh; line-height: 5vh">
-                <h4 class="weui-media-box__title">处理中</h4>
-            </div>
             <div class="weui-btn-area">
-                <a class="weui-btn weui-btn_primary" style="width: 30%;" href="javascript:reply();">回复</a>
+                <a class="weui-btn weui-btn_default">处理中</a>
+                <a class="weui-btn weui-btn_primary" href="javascript:reply();">回复</a>
             </div>
-            <p class="weui-media-box__desc">回复列表：</p>
+            <p class="weui-media-box__desc" style="margin-top: 3vh;">回复列表：</p>
             <div id="qz_doing_detail" style="margin-top: 3vh;"></div>
         </#if>
         <#if task.taskStatus == 3>
-            <div class="weui-btn_primary" style="margin-bottom: 3vh; display: flex; justify-content: center; height: 5vh; line-height: 5vh">
-                <h4 class="weui-media-box__title">已处理完成</h4>
+            <div class="weui-btn-area">
+                <a class="weui-btn weui-btn_default">已处理完成</a>
             </div>
-            <p class="weui-media-box__desc">回复列表：</p>
+            <p class="weui-media-box__desc" style="margin-top: 3vh;">回复列表：</p>
             <div id="qz_done_detail" style="margin-top: 3vh;"></div>
         </#if>
     </div>
@@ -138,7 +136,7 @@
                     $("#qz_doing_detail").empty();
                     for (let i = 0; i < data.data.length; i++) {
                         let reply = data.data[i];
-                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '</p>\n' +
+                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '&emsp;' + reply.timeUpdate + '</p>\n' +
                             '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
                     }
                 }
@@ -146,7 +144,7 @@
                     $("#qz_done_detail").empty();
                     for (let i = 0; i < data.data.length; i++) {
                         let reply = data.data[i];
-                        $("#qz_done_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '</p>\n' +
+                        $("#qz_done_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '&emsp;' + reply.timeUpdate + '</p>\n' +
                             '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
                     }
                 }

whepi-web/src/main/java/com/bofeng/entity/QzTaskReply.java

@@ -1,9 +1,10 @@
 package com.bofeng.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.joda.time.DateTime;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
 public class QzTaskReply implements Serializable {
@@ -41,7 +42,8 @@ public class QzTaskReply implements Serializable {
   /**
    * 新增时间
    */
-  private DateTime timeCreate;
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+  private Date timeCreate;
 
   /**
    * 修改人
@@ -51,7 +53,8 @@ public class QzTaskReply implements Serializable {
   /**
    * 修改时间
    */
-  private DateTime timeUpdate;
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+  private Date timeUpdate;
 
   private String taskTitle;
   private Integer taskStatus;