Merge remote-tracking branch 'origin/master'

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

whepi-ui/templates/home/home.ftl

@@ -2,6 +2,7 @@
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">
+    <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
     <div class="weui-tab__bd">
         <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
             <#include "/home/ribao.ftl" /></div>
@@ -53,7 +54,6 @@
             });
         });
 
-        console.log(userid);
 
         ribao_init();
         qiuzhu_init();
@@ -63,6 +63,20 @@
         ribao_commit();
         submit_back();
         familyClick();
+
+        $(function () {
+            $("#ground").bind("click", function () {
+                if ($("#Gj").val() == "off") {
+                    $("#Gj").val("on");
+                    console.log("关闭查看所有");
+                    qzMy_help(1);
+                } else {
+                    $("#Gj").val("off");
+                    console.log("查看已解决的");
+                    qzMy_help(2);
+                }
+            });
+        });
     })(jQuery);
 
 

whepi-ui/templates/home/qiuzhu.ftl

@@ -4,7 +4,7 @@
             <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1" module="qiu_zhu" onclick="familyClick()">
                 小区求助
             </a>
-            <a class="weui-navbar__item" target="#qz_nav2" module="qiu_zhu" id="qzMy_help" onclick="qzMy_help()">
+            <a class="weui-navbar__item" target="#qz_nav2" module="qiu_zhu" id="qzMy_help" onclick="qzMy_help('')">
                 我的求助
             </a>
         </div>
@@ -45,7 +45,7 @@
                     </a>-->
                 </div>
                 <div id="titlteZs" style="display: none">
-                    <div class="page__bd" >
+                    <div class="page__bd">
                         <div class="weui-panel weui-panel_access" id="qzHS">
                         </div>
                         <div class="button-sp-area">
@@ -71,8 +71,9 @@
                                 <input type="text" class="weui-input" placeholder="搜素关键字"/>
                             </div>
                         </div>
+                        <input hidden="hidden" name="Gj11" id="Gj" value="on" type="radio" checked="checked"/>
                         <div class="weui-cell__ft">
-                            <input class="weui-switch" type="checkbox">
+                            <input class="weui-switch" type="checkbox" id="ground" name="ground">
                         </div>
                         <div class="weui-cell__bd">只显示未解决</div>
                     </div>
@@ -165,7 +166,7 @@
                 </div>
 
                 <div id="familyDisplay" style="display: none">
-                    <div class="page__bd" >
+                    <div class="page__bd">
                         <div class="weui-panel weui-panel_access" id="qzHS2">
                         </div>
                         <div class="button-sp-area">
@@ -181,11 +182,28 @@
 </div>
 
 <script>
+
     function qzCommit() {
         /*     $("#qzf1").val()
              $("#qzf2").val()
              $("#qzf3").val()
              $("#qzf4").val()*/
+        var taskTitle = $("#Qzinput").val();
+        if (!taskTitle) {
+            alert("请输入求助标题！")
+            return false;
+        }
+        var taskTarget = $("#qzf2").val();
+        if (!taskTarget) {
+            alert("请输入求助目标！")
+            return false;
+        }
+        var remark = $("#remarks").val();
+        if (!remark) {
+            alert("请输入求助内容！")
+            return false;
+        }
+
         var data = {}
         var tep = JSON.stringify(data);
         console.log(tep)
@@ -198,13 +216,13 @@
             },
             type: 'GET',
             success: function (data) {
-                if ($('#notPlay')[0].style.display == 'none') {
+                /*if ($('#notPlay')[0].style.display == 'none') {
                     $('#play').toggle();
                     $('#notPlay')[0].style.display = '';
                 } else {
                     $('#play')[0].style.display = '';
                     $('#notPlay')[0].style.display = 'none';
-                }
+                }*/
             },
             error: function () {
 
@@ -213,11 +231,11 @@
     }
 
     //我的求助的页面展示
-    function qzMy_help() {
+    function qzMy_help(status) {
         $('#valueQz').empty();//清除节点
         $.ajax({
             url: '/home/home/queryQzTask',
-            data: {},
+            data: {taskStatus:status},
             type: 'GET',
             success: function (data) {
                 console.log(data);
@@ -252,7 +270,6 @@
             $('#familyDisplay')[0].style.display = '';
             $("#notPlay").toggle();
             $('#qzHS2').empty();
-            debugger
             $.ajax({
                 url: '/home/home/taskQuery',
                 data: {taskId: v.taskId},

whepi-ui/templates/yeweihui/home.ftl

@@ -2,6 +2,7 @@
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">
+    <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
     <div class="weui-tab__bd">
         <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
             <#include "/yeweihui/ribaoDy.ftl" /></div>

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

@@ -20,5 +20,5 @@ public interface QzTaskDao extends BaseMapper<QzTask> {
 
     Integer updateStatusById(@Param("taskId") Long taskId, @Param("status") Integer status);
 
-    List<QzTask> queryQzTask();
+    List<QzTask> queryQzTask(@Param("taskStatus")Integer taskStatus);
 }

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

@@ -52,7 +52,7 @@ public class QzTaskService {
 
 
 
-  public List<QzTask> queryQzTask(){
-    return qzTaskDao.queryQzTask();
+  public List<QzTask> queryQzTask(Integer taskStatus){
+    return qzTaskDao.queryQzTask(taskStatus);
   }
 }

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

@@ -30,35 +30,35 @@ import java.util.Map;
 @RestController
 public class HomeController {
 
-    @Autowired
-    private HomeService homeService;
+  @Autowired
+  private HomeService homeService;
 
-    @Autowired
-    private QzTaskService qzTaskService;
+  @Autowired
+  private QzTaskService qzTaskService;
 
-    @Autowired
-    private QzTaskReplyService qzTaskReplyService;
+  @Autowired
+  private QzTaskReplyService qzTaskReplyService;
 
-    @GetMapping("/home/home.html")
-    public ModelAndView home(ModelMap model) {
-        //UserOpen userOpen = homeService.getUserOpen();
-        model.put("user", new JsonWapper("{\"www\": \"er\"}"));
-        return new ModelAndView("/home/home.ftl", model);
-    }
+  @GetMapping("/home/home.html")
+  public ModelAndView home(ModelMap model) {
+    //UserOpen userOpen = homeService.getUserOpen();
+    model.put("user", new JsonWapper("{\"www\": \"er\"}"));
+    return new ModelAndView("/home/home.ftl", model);
+  }
 
-    //家庭求助
-    @GetMapping("/home/home/addFimaly")
-    public ModelOps family(@Pd(name = "taskTitle") String taskTitle,
-                           @Pd(name = "taskTarget") String taskTarget,
-                           @Pd(name = "remark") String remark) {
-        return ModelOps.newSuccess(qzTaskService.addHelp(taskTitle, taskTarget, remark));
-    }
+  //家庭求助
+  @GetMapping("/home/home/addFimaly")
+  public ModelOps family(@Pd(name="taskTitle")String taskTitle,
+                         @Pd(name = "taskTarget")String taskTarget,
+                         @Pd(name = "remark")String remark) {
+    return ModelOps.newSuccess(qzTaskService.addHelp(taskTitle,taskTarget,remark));
+  }
 
-    //我的在求助的展示
-    @GetMapping("/home/home/queryQzTask")
-    public Model<List<QzTask>> queryQzTask() {
-        return Model.newSuccess(qzTaskService.queryQzTask());
-    }
+  //我的在求助的展示
+  @GetMapping("/home/home/queryQzTask")
+  public Model<List<QzTask>> queryQzTask(@Pd(name = "taskStatus",required = false)Integer taskStatus){
+    return Model.newSuccess(qzTaskService.queryQzTask(taskStatus));
+  }
 
     //小区求助的查看
     @GetMapping("/home/home/taskQuery")

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

@@ -48,6 +48,8 @@ public class UserOpenController {
         if (userId == 0) {
             UserOpen userOpen = homeService.getUserOpen();
             list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1224239062748065800L);
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");
         } else {

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

@@ -5,20 +5,26 @@
     select * from qz_task
   </select>
 
-  <select id="queryByTaskId" resultType="com.bofeng.entity.QzTask">
+    <select id="queryByTaskId" resultType="com.bofeng.entity.QzTask">
     select * from qz_task where task_id=#{taskId}
   </select>
 
-  <select id="queryByHouseNumber" resultType="com.bofeng.entity.QzTask">
+    <select id="queryByHouseNumber" resultType="com.bofeng.entity.QzTask">
     select * from qz_task where task_status=#{status} and house_number like concat('%', #{houseNumber}, '%')
   </select>
 
-  <update id="updateStatusById">
+    <update id="updateStatusById">
     update qz_task set task_status=#{status} where task_id=#{taskId}
   </update>
 
     <select id="queryQzTask" resultType="com.bofeng.entity.QzTask">
-    select * from qz_task order by time_update desc
+        select * from qz_task
+        <where>
+            <if test="taskStatus!=null and taskStatus!=''">
+                task_status=#{taskStatus}
+            </if>
+        </where>
+        order by time_update desc
     </select>
 
 </mapper>