Merge remote-tracking branch 'origin/master'

whepi-ui/templates/yeweihui/qiuzhu.js

@@ -91,10 +91,11 @@ function makeList1(tasks) {
     $('#qz_list1').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
+    return;
   }
   for (var i = 0; i < tasks.length; i++) {
     var task = tasks[i];
-    $('#qz_list1').append($('<a onclick="javascript:itemSelect(' + task.taskId + ');" class="weui-media-box weui-media-box_appmsg">\n' +
+    $('#qz_list1').append($('<a onclick="javascript:itemSelect(' + "'" + task.taskId + "'" + ');" class="weui-media-box weui-media-box_appmsg">\n' +
         '                            <div class="weui-media-box__bd">\n' +
         '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
         '                                    <p class="weui-media-box__desc">' + task.houseNumber + '</p>\n' +
@@ -105,6 +106,7 @@ function makeList1(tasks) {
         '                            </div>\n' +
         '                        </a>'));
   }
+  $('#qz_list1').append('<br>');
 }
 
 function makeList2(tasks) {
@@ -114,10 +116,11 @@ function makeList2(tasks) {
     $('#qz_list2').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
+    return;
   }
   for (var i = 0; i < tasks.length; i++) {
     var task = tasks[i];
-    $('#qz_list2').append($('<a onclick="javascript:itemSelect(' + task.taskId + ');" class="weui-media-box weui-media-box_appmsg">\n' +
+    $('#qz_list2').append($('<a onclick="javascript:itemSelect(' + "'" + task.taskId + "'" + ');" class="weui-media-box weui-media-box_appmsg">\n' +
         '                            <div class="weui-media-box__bd">\n' +
         '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
         '                                    <p class="weui-media-box__desc">' + task.houseNumber + '</p>\n' +
@@ -128,6 +131,7 @@ function makeList2(tasks) {
         '                            </div>\n' +
         '                        </a>'));
   }
+  $('#qz_list2').append('<br>');
 }
 
 function makeList3(tasks) {
@@ -137,10 +141,12 @@ function makeList3(tasks) {
     $('#qz_list3').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
+    return;
   }
   for (var i = 0; i < tasks.length; i++) {
     var task = tasks[i];
-    $('#qz_list3').append($('<a onclick="javascript:itemSelect(' + task.taskId + ');" class="weui-media-box weui-media-box_appmsg">\n' +
+    let taskid = task.taskId + '';
+    $('#qz_list3').append($('<a onclick="javascript:itemSelect(' + "'" + task.taskId + "'" + ');" class="weui-media-box weui-media-box_appmsg">\n' +
         '                            <div class="weui-media-box__bd">\n' +
         '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
         '                                    <p class="weui-media-box__desc">' + task.houseNumber + '</p>\n' +
@@ -151,6 +157,7 @@ function makeList3(tasks) {
         '                            </div>\n' +
         '                        </a>'));
   }
+  $('#qz_list3').append('<br>');
 }
 
 function itemSelect(taskId) {

whepi-ui/templates/yeweihui/qiuzhuDetail.ftl

@@ -20,14 +20,16 @@
             </div>
         </#if>
         <#if task.taskStatus == 2>
-            <div style="display: flex; justify-content: center;">
+            <div class="weui-btn_primary" style="display: flex; justify-content: center; height: 5vh; line-height: 5vh">
                 <h4 class="weui-media-box__title">处理中</h4>
             </div>
+            <div id="qz_doing_detail" style="margin-top: 3vh;"></div>
         </#if>
         <#if task.taskStatus == 3>
-            <div style="display: flex; justify-content: center;">
+            <div class="weui-btn_primary" style="display: flex; justify-content: center; height: 5vh; line-height: 5vh">
                 <h4 class="weui-media-box__title">已处理完成</h4>
             </div>
+            <div id="qz_done_detail"></div>
         </#if>
     </div>
 
@@ -54,6 +56,9 @@
     (function ($) {
 
         console.log('详情页' + task);
+        if (task.taskStatus == 2 || task.taskStatus == 3) {
+            getdealdetail();
+        }
 
     })(jQuery);
 
@@ -67,6 +72,8 @@
 
     function send() {
 
+        let userId = $('#userId').val() ? $('#userId').val() : "10000";
+
         let qzcontent = $('#qz_content').val();
         if (qzcontent.length <= 0){
             alert("请输入内容");
@@ -74,12 +81,14 @@
         }
 
         $.ajax({
-            url: '/yeweihui/qiuzhu/reply.json',
+            url: '/yeweihui/qiuzhu/reply/add.json',
             type: 'post',
             data: {
-                userId: task.userId,
+                userId: userId,
                 taskId: task.taskId,
-                replyContent: qzcontent
+                replyContent: qzcontent,
+                userCreate: userId,
+                userUpdate: userId,
             },
             success: function (data) {
                 $.closePopup();
@@ -89,4 +98,35 @@
             }
         });
     }
+
+    function getdealdetail() {
+        $.ajax({
+            url: '/yeweihui/qiuzhu/reply/querybytaskid.json',
+            type: 'post',
+            data: {
+                taskId: task.taskId,
+            },
+            success: function (data) {
+                console.log("---返回数据---",data);
+
+                if (task.taskStatus == 2) {
+                    for (let i = 0; i < data.data.length; i++) {
+                        let reply = data.data[i];
+                        $("#qz_doing_detail").append('<h4 class="weui-media-box__title">回复' + i + '</h4>\n' +
+                            '        <p class="weui-media-box__desc">' + reply.replyContent + '</p><br>');
+                    }
+                }
+                else if (task.taskStatus == 3) {
+                    for (let i = 0; i < data.data.length; i++) {
+                        let reply = data.data[i];
+                        $("#qz_done_detail").append('<h4 class="weui-media-box__title">回复' + i + '</h4>\n' +
+                            '        <p class="weui-media-box__desc">' + reply.replyContent + '</p><br>');
+                    }
+                }
+            },
+            error: function () {
+                $.alert("网络异常");
+            }
+        });
+    }
 </script>

whepi-web/src/main/java/com/bofeng/dao/QzTaskReplyDao.java

@@ -14,4 +14,6 @@ public interface QzTaskReplyDao extends BaseMapper<QzTaskReply> {
 
   List<QzTaskReply> taskQuery(@Param("taskId")Long taskId);
 
+  List<QzTaskReply> queryQzTaskReplyByTaskId(@Param("taskId")Long taskId);
+
 }

whepi-web/src/main/java/com/bofeng/service/QzTaskReplyService.java

@@ -36,4 +36,8 @@ public class QzTaskReplyService {
         return qzTaskReplyDao.insert(qzTaskReply);
     }
 
+    public List<QzTaskReply> queryQzTaskReplyByTaskId(Long taskId) {
+        return qzTaskReplyDao.queryQzTaskReplyByTaskId(taskId);
+    }
+
 }

whepi-web/src/main/java/com/bofeng/wx/controller/HomeController.java

@@ -60,9 +60,15 @@ public class HomeController {
     return Model.newSuccess(qzTaskService.queryQzTask(taskStatus));
   }
 
-  //小区求助的查看
-  @GetMapping("/home/home/taskQuery")
-  public Model<List<QzTaskReply>> taskQuery(@Pd(name = "taskId")Long taskId){
-    return Model.newSuccess(qzTaskReplyService.taskQuery(taskId));
-  }
+    //小区求助的查看
+    @GetMapping("/home/home/taskQuery")
+    public Model<List<QzTaskReply>> taskQuery(@Pd(name = "taskId") Long taskId) {
+        return Model.newSuccess(qzTaskReplyService.taskQuery(taskId));
+    }
+
+    @GetMapping("/home/home_new.html")
+    public ModelAndView hmoe_new(ModelMap model) {
+        model.put("user", new JsonWapper("{\"www\": \"er\"}"));
+        return new ModelAndView("/home/home_new.ftl", model);
+    }
 }

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -6,7 +6,6 @@ import com.bofeng.service.HomeService;
 import com.bofeng.service.QzTaskService;
 import com.bofeng.service.RbService;
 import com.bofeng.service.UserOpenService;
-import com.yvan.Model;
 import com.yvan.platform.YvanUtil;
 import com.yvan.springmvc.ResultModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,10 +48,10 @@ public class UserOpenController {
     public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-            UserOpen userOpen = homeService.getUserOpen();
-            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//            list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(1224239062748065800L);
+//            UserOpen userOpen = homeService.getUserOpen();
+//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+            list = userRoleMapper.getUserRoleByUserId(1224706869998772226L);
+            UserOpen userOpen = userOpenMapper.selectByUserId(1224706869998772226L);
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");
         } else {

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -93,8 +93,8 @@ public class YeWeiHuiController {
         return new ModelAndView("/yeweihui/qiuzhuDetail.ftl", model);
     }
 
-    @PostMapping("/yeweihui/qiuzhu/reply.json")
-    public ModelOps replyQiuzhu(QzTaskReply qzTaskReply) {
+    @PostMapping("/yeweihui/qiuzhu/reply/add.json")
+    public ModelOps replyQiuzhuInsert(QzTaskReply qzTaskReply) {
 
         Integer success = qzTaskReplyService.insertQzTaskReply(qzTaskReply);
 
@@ -106,6 +106,14 @@ public class YeWeiHuiController {
         }
     }
 
+    @PostMapping("/yeweihui/qiuzhu/reply/querybytaskid.json")
+    public Model replyQiuzhuQueryByTaskId(@Pd(name = "taskId") Long taskId) {
+
+        List<QzTaskReply> reply = qzTaskReplyService.queryQzTaskReplyByTaskId(taskId);
+
+        return Model.newSuccess(reply);
+    }
+
     @PostMapping("/yeweihui/qiuzhu/list.json")
     public Model queryByHouseNumber(@Pd(name = "houseNumber") String houseNumber, @Pd(name = "status") Integer status) {
         List<QzTask> list = qzTaskService.queryByHouseNumber(houseNumber, status);

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

@@ -8,4 +8,8 @@
      INNER JOIN qz_task_reply b on a.task_id=b.task_id
      where a.task_id=#{taskId}
     </select>
+
+    <select id="queryQzTaskReplyByTaskId" resultType="com.bofeng.entity.QzTaskReply">
+        select * from qz_task_reply where task_id=#{taskId}
+    </select>
 </mapper>