Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-ui/templates/yeweihui/home.ftl

@@ -15,11 +15,11 @@
     </div>
     <div class="weui-tabbar">
         <a href="#tab1" class="weui-tabbar__item weui-bar__item--on">
-            <div class="weui-tabbar__icon"> <img src="./images/icon_nav_button.png" alt=""> </div>
+            <div class="weui-tabbar__icon"> <img src="/static/images/wx/order.png" alt=""> </div>
             <p class="weui-tabbar__label">每日上报</p>
         </a>
         <a href="#tab2" class="weui-tabbar__item">
-            <div class="weui-tabbar__icon"> <img src="./images/icon_nav_msg.png" alt=""> </div>
+            <div class="weui-tabbar__icon"> <img src="/static/images/wx/customer_service.png" alt=""> </div>
             <p class="weui-tabbar__label">求助</p>
         </a>
         <#--<a href="#tab3" class="weui-tabbar__item">-->

whepi-ui/templates/yeweihui/qiuzhu.ftl

@@ -1,4 +1,15 @@
 <div class="page__bd">
+<#--    <div style="width: 100vw; height: 30vw;display: flex; flex-direction: row;">-->
+<#--        <div style="width: 30%;">-->
+<#--            <img src="/static/images/yeweihui/love.jpeg" alt="" style="height: 100%; width: 100%;" />-->
+<#--        </div>-->
+<#--        <div style="width: 70%;">-->
+<#--            <div style="text-align: center; height: 20%;">2020-02-02</div>-->
+<#--            <div style="background-color: #2D93CA; height: ">-->
+<#--                竖式是是-->
+<#--            </div>-->
+<#--        </div>-->
+<#--    </div>-->
     <div class="weui-tab">
         <div class="weui-navbar">
             <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1" module="qiu_zhu">

whepi-ui/templates/yeweihui/qiuzhu.js

@@ -3,7 +3,6 @@ function qiuzhu_init() {
   makeUI(taskList);
 
   $('#qz_btnQZ1').on('click', function () {
-
     $.ajax({
       url: '/yeweihui/qiuzhu/list.json',
       type: 'post',
@@ -22,7 +21,6 @@ function qiuzhu_init() {
   });
 
   $('#qz_btnQZ2').on('click', function () {
-
     $.ajax({
       url: '/yeweihui/qiuzhu/list.json',
       type: 'post',
@@ -87,7 +85,7 @@ function makeUI(tasks) {
 function makeList1(tasks) {
 
   $('#qz_list1').empty();
-  if (tasks.length <= 0) {
+  if (tasks == undefined || tasks.length <= 0) {
     $('#qz_list1').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
@@ -111,7 +109,7 @@ function makeList1(tasks) {
 function makeList2(tasks) {
 
   $('#qz_list2').empty();
-  if (tasks.length <= 0) {
+  if (tasks == undefined || tasks.length <= 0) {
     $('#qz_list2').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
@@ -135,7 +133,7 @@ function makeList2(tasks) {
 function makeList3(tasks) {
 
   $('#qz_list3').empty();
-  if (tasks.length <= 0) {
+  if (tasks == undefined || tasks.length <= 0) {
     $('#qz_list3').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
@@ -158,5 +156,5 @@ function makeList3(tasks) {
 }
 
 function itemSelect(taskId) {
-  window.location.href = "/yeweihui/qiuzhuDetail.html?taskId=" + taskId;
+  window.location.href = "/yeweihui/qiuzhuDetail.html?taskId=" + taskId + "&userId=" + $('#userId').val();
 }

whepi-ui/templates/yeweihui/qiuzhuDetail.ftl

@@ -5,14 +5,14 @@
 
     <div class="weui-btn-area">
 
-        <h4 class="weui-media-box__title">求助标题</h4>
-        <p class="weui-media-box__desc">${ task.taskTitle }</p>
+        <p class="weui-media-box__desc">求助标题</p>
+        <h4 class="weui-media-box__title">${ task.taskTitle }</h4>
         <br>
-        <h4 class="weui-media-box__title">求助对象</h4>
-        <p class="weui-media-box__desc">${ task.taskTarget }</p>
+        <p class="weui-media-box__desc">求助对象</p>
+        <h4 class="weui-media-box__title">${ task.taskTarget }</h4>
         <br>
-        <h4 class="weui-media-box__title">求助内容</h4>
-        <p class="weui-media-box__desc">${ task.remark }</p>
+        <p class="weui-media-box__desc">求助内容</p>
+        <h4 class="weui-media-box__title">${ task.remark }</h4>
         <br>
         <#if task.taskStatus == 1>
             <div class="weui-btn-area">
@@ -20,13 +20,13 @@
             </div>
         </#if>
         <#if task.taskStatus == 2>
-            <div class="weui-btn_primary" style="display: flex; justify-content: center; height: 5vh; line-height: 5vh">
+            <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_doing_detail" style="margin-top: 3vh;"></div>
         </#if>
         <#if task.taskStatus == 3>
-            <div class="weui-btn_primary" style="display: flex; justify-content: center; height: 5vh; line-height: 5vh">
+            <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>
@@ -52,10 +52,9 @@
 
 <script>
     var task = ${taskJson};
-
+    var userId = ${userId};
     (function ($) {
 
-        console.log('详情页' + task);
         if (task.taskStatus == 2 || task.taskStatus == 3) {
             getdealdetail();
         }
@@ -72,8 +71,6 @@
 
     function send() {
 
-        let userId = $('#userId').val() ? $('#userId').val() : "10000";
-
         let qzcontent = $('#qz_content').val();
         if (qzcontent.length <= 0){
             alert("请输入内容");
@@ -92,6 +89,7 @@
             },
             success: function (data) {
                 $.closePopup();
+                window.location.href = "/yeweihui/home.html";
             },
             error: function () {
                 $.alert("网络异常");
@@ -112,15 +110,15 @@
                 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>');
+                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">回复' + i + '</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('<h4 class="weui-media-box__title">回复' + i + '</h4>\n' +
-                            '        <p class="weui-media-box__desc">' + reply.replyContent + '</p><br>');
+                        $("#qz_done_detail").append('<p class="weui-media-box__desc">回复' + i + '</p>\n' +
+                            '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
                     }
                 }
             },

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

@@ -3,7 +3,7 @@ package com.bofeng.wx.controller;
 import com.bofeng.entity.QzTask;
 import com.bofeng.entity.QzTaskReply;
 import com.bofeng.entity.SysUptownHouse;
-import com.bofeng.entity.sysUptownUnit;
+import com.bofeng.service.HomeService;
 import com.bofeng.service.QzTaskReplyService;
 import com.bofeng.service.QzTaskService;
 import com.bofeng.service.RbService;
@@ -37,6 +37,9 @@ public class YeWeiHuiController {
     @Autowired
     private QzTaskReplyService qzTaskReplyService;
 
+    @Autowired
+    private HomeService homeService;
+
     @GetMapping("/yeweihui/home.html")
     public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) {
 
@@ -53,7 +56,7 @@ public class YeWeiHuiController {
     }
 
     @GetMapping("/yeweihui/qiuzhuDetail.html")
-    public ModelAndView qiuzhudetail(@Pd(name = "taskId") Long taskId, ModelMap model) throws JsonProcessingException {
+    public ModelAndView qiuzhudetail(@Pd(name = "taskId") Long taskId,@Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
 
         QzTask task = qzTaskService.queryByTaskId(taskId);
 //        A业委会，B居委会，C物业，D志愿者
@@ -90,6 +93,7 @@ public class YeWeiHuiController {
 
         model.put("taskJson", new JsonWapper(task));
         model.put("task", task);
+        model.put("userId", "\""+userId+"\"");
 
         return new ModelAndView("/yeweihui/qiuzhuDetail.ftl", model);
     }
@@ -97,12 +101,12 @@ public class YeWeiHuiController {
     @PostMapping("/yeweihui/qiuzhu/queryTasksByStatus.json")
     public Model queryTasksByStatus(@Pd(name = "status") Integer status) {
 
-       // List<QzTask> taskList = qzTaskService.queryQzTask(status);
+        List<QzTask> taskList = qzTaskService.queryQzTaskByStatus(status);
 
-        return Model.newSuccess(null);
+        return Model.newSuccess(taskList);
     }
 
-        @PostMapping("/yeweihui/qiuzhu/reply/add.json")
+    @PostMapping("/yeweihui/qiuzhu/reply/add.json")
     public ModelOps replyQiuzhuInsert(QzTaskReply qzTaskReply) {
 
         Integer success = qzTaskReplyService.insertQzTaskReply(qzTaskReply);
@@ -124,9 +128,13 @@ public class YeWeiHuiController {
     }
 
     @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);
+    public Model queryByHouseNumber(String houseNumber, @Pd(name = "status") Integer status) {
 
+        if (houseNumber.length() <= 0) {
+            return Model.newSuccess(qzTaskService.queryQzTaskByStatus(status));
+        }
+
+        List<QzTask> list = qzTaskService.queryByHouseNumber(houseNumber, status);
         return Model.newSuccess(list);
     }