显示回复列表

whepi-ui/templates/yeweihui/qiuzhuDetail.ftl

@@ -27,13 +27,18 @@
             <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>
+            </div>
+            <p class="weui-media-box__desc">回复列表：</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>
-            <div id="qz_done_detail"></div>
+            <p class="weui-media-box__desc">回复列表：</p>
+            <div id="qz_done_detail" style="margin-top: 3vh;"></div>
         </#if>
     </div>
 
@@ -69,6 +74,10 @@
         $("#qz_showPop").popup();
     }
 
+    function reply() {
+        $("#qz_showPop").popup();
+    }
+
     function close() {
         $.closePopup();
     }
@@ -92,8 +101,18 @@
                 userUpdate: userId,
             },
             success: function (data) {
-                $.closePopup();
-                window.location.href = "/yeweihui/home.html?show=qiuzhu&userId=" + userId;
+                if (data.success == true) {
+                    $.closePopup();
+                    if (task.taskStatus == 1) {
+                        window.location.href = "/yeweihui/home.html?show=qiuzhu&userId=" + userId;
+                    }
+                    else if (task.taskStatus == 2) {
+                        getdealdetail();
+                    }
+                }
+                else {
+                    $.alert("操作失败");
+                }
             },
             error: function () {
                 $.alert("网络异常");
@@ -116,16 +135,18 @@
                 console.log("---返回数据---",data);
 
                 if (task.taskStatus == 2) {
+                    $("#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">回复' + i+1 + '</p>\n' +
+                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '</p>\n' +
                             '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
                     }
                 }
                 else if (task.taskStatus == 3) {
+                    $("#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">回复' + i+1 + '</p>\n' +
+                        $("#qz_done_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '</p>\n' +
                             '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
                     }
                 }

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

@@ -4,7 +4,6 @@ import lombok.Data;
 import org.joda.time.DateTime;
 
 import java.io.Serializable;
-import java.util.Date;
 
 @Data
 public class QzTaskReply implements Serializable {
@@ -25,6 +24,11 @@ public class QzTaskReply implements Serializable {
   private Long userId;
 
   /**
+   * 回复用户ID
+   */
+  private String nikeName;
+
+  /**
    * 回复内容
    */
   private String replyContent;

whepi-web/src/main/resources/mapper/QzTaskReplyDao.xml

@@ -13,7 +13,10 @@
     </select>
 
     <select id="queryQzTaskReplyByTaskId" resultType="com.bofeng.entity.QzTaskReply">
-        select * from qz_task_reply where task_id=#{taskId}
+        select a.*, b.nick_name, b.user_id as b_user_id from qz_task_reply a
+        LEFT JOIN sys_user_open b
+        on a.user_id=b.user_id
+        where task_id=#{taskId}
     </select>
 
     <select id="selectId" resultType="com.bofeng.entity.QzTaskReply">