求助

whepi-ui/templates/home/home.ftl

@@ -69,11 +69,11 @@
                 if ($("#Gj").val() == "off") {
                     $("#Gj").val("on");
                     console.log("关闭查看所有");
-                    qzMy_help(1);
+                    qzMy_help('', '');
                 } else {
                     $("#Gj").val("off");
                     console.log("查看已解决的");
-                    qzMy_help(2);
+                    qzMy_help(3, '');
                 }
             });
         });
@@ -87,6 +87,7 @@
             url: '/home/home/queryQzTask',
             data: {},
             type: 'GET',
+            async: false,
             success: function (data) {
                 console.log(data);
                 if (data.data.length > 0) {
@@ -111,44 +112,55 @@
                 '                                <p class="weui-media-box__desc" >' + v.taskTitle + '</p>\n' +
                 '                            </div>\n' +
                 '                        </div>\n' +
-                '                        <div class="weui-cell__ft"></div>\n' +
+                '                        <div class="weui-cell__ft">' + conversion(v.taskStatus) + '</div>\n' +
                 '                    </a>\n<br />'));
 
     }
 
-function xiaoQuItemClick(v) {
-      /*alert(v.taskId)*/
-    if ($('#titlteZs')[0].style.display == 'none') {
-        $('#notitle').toggle();
-        $('#titlteZs')[0].style.display = '';
-        $('#qzHS').empty();//清除节点
-        //详情页面的展示
-        $.ajax({
-            url: '/home/home/taskQuery',
-            data: {taskId:v.taskId},
-            type: 'GET',
-            success: function (data) {
-                console.log(data);
-                if (data.data.length > 0) {
-                    hasData = true;
-                    $('#qzHS').append($('<div>'+data.data[0].taskTitle+'</div>'))
-                    data.data.forEach(function (v) {
-                        shValue(v);
-                    });
-                } else {
-
+    function xiaoQuItemClick(v) {
+        /*alert(v.taskId)*/
+        if ($('#titlteZs')[0].style.display == 'none') {
+            $('#notitle').toggle();
+            $('#titlteZs')[0].style.display = '';
+            $('#qzHS').empty();//清除节点
+            //详情页面的展示
+            $.ajax({
+                url: '/home/home/taskQuery',
+                data: {taskId: v.taskId},
+                type: 'GET',
+                success: function (data) {
+                    console.log(data);
+                    if (data.data.length > 0) {
+                        hasData = true;
+                        $('#qzHS').append($('<div>' + data.data[0].taskTitle + '</div>'))
+                        data.data.forEach(function (v) {
+                            shValue(v);
+                        });
+                    } else {
+
+                    }
+                },
+                error: function () {
                 }
-            },
-            error: function () {
-            }
-        });
-        /*$('#qzHS').*/
+            });
+            /*$('#qzHS').*/
 
-    } else {
-        $('#notitle')[0].style.display = '';
-        $('#titlteZs')[0].style.display = 'none';
+        } else {
+            $('#notitle')[0].style.display = '';
+            $('#titlteZs')[0].style.display = 'none';
+        }
     }
-}
 
 
+    //完成 已解决  为完成的方法
+    function conversion(a) {
+        if (a == 1) {
+            return "<span style='color:red;'>未解决</span>";
+        } else if (a == 2) {
+            return "<span style='color:Black;'>处理中</span>";
+        } else {
+            return "<span style='color:green;'>已完成</span>";
+        }
+    }
+
 </script>

whepi-ui/templates/home/qiuzhu.ftl

@@ -11,6 +11,9 @@
         <div class="weui-tab__panel">
             <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
                 <div id="notitle">
+                    <div>
+
+                    </div>
                 <#--<a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form" href="javascript:;">
                         <div class="weui-cell__bd">
                             <div class="weui-media-box weui-media-box_text" id="title">
@@ -68,14 +71,17 @@
                     <div class="weui-cell weui-cell_active weui-cell_switch">
                         <div class="weui-cell">
                             <div class="weui-cell__bd">
-                                <input type="text" class="weui-input" placeholder="搜素关键字"/>
+                                <input id="quetyFamily" type="text" class="weui-input" placeholder="搜素关键字"
+                                       maxlength="10"/>
                             </div>
+                            <a href="javascript:"
+                               class="weui-btn weui-btn_mini weui-btn_primary" onclick="queryQz()">查询</a>
                         </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" id="ground" name="ground">
                         </div>
-                        <div class="weui-cell__bd">只显示未解决</div>
+                        <div class="weui-cell__bd">已解决</div>
                     </div>
                     <div id="family">
                         <div class="weui-panel__bd" id="valueQz">
@@ -102,7 +108,7 @@
                     <div class="weui-form__control-area">
                         <div class="weui-cells__group weui-cells__group_form">
                             <div class="weui-cells weui-cells_checkbox">
-                                <label class="weui-cell weui-cell_active weui-check__label" for="qzf1">
+                               <#-- <label class="weui-cell weui-cell_active weui-check__label" for="qzf1">
                                     <div class="weui-cell__hd">
                                         <input type="checkbox" class="weui-check" name="checkbox1" id="qzf1"
                                                value="居委会">
@@ -111,7 +117,7 @@
                                     <div class="weui-cell__bd">
                                         <p>居委会</p>
                                     </div>
-                                </label>
+                                </label>-->
                                 <label class="weui-cell weui-cell_active weui-check__label" for="qzf2">
                                     <div class="weui-cell__hd">
                                         <input type="checkbox" name="checkbox2" class="weui-check" id="qzf2"
@@ -122,7 +128,7 @@
                                         <p>业委会</p>
                                     </div>
                                 </label>
-                                <label class="weui-cell weui-cell_active weui-check__label" for="qzf3">
+                                <#--<label class="weui-cell weui-cell_active weui-check__label" for="qzf3">
                                     <div class="weui-cell__hd">
                                         <input type="checkbox" name="checkbox3" class="weui-check" id="qzf3" value="物业">
                                         <i class="weui-icon-checked"></i>
@@ -140,7 +146,7 @@
                                     <div class="weui-cell__bd">
                                         <p>志愿者</p>
                                     </div>
-                                </label>
+                                </label>-->
                             <#--<a href="javascript:void(0);" class="weui-cell weui-cell_active weui-cell_link">
                                 <div class="weui-cell__bd">添加更多</div>
                             </a>-->
@@ -180,7 +186,11 @@
                         </div>
                         <div class="button-sp-area">
                             <div class="weui-btn-area">
-                                <a class="weui-btn weui-btn_primary" onclick="qzBackHome();">返回</a>
+                                <a class="weui-btn weui-btn_default" onclick="qzBackHome();">返回</a>
+                            </div>
+                            <div class="weui-btn-area">
+                                <a class="weui-btn weui-btn_primary" onclick="HomeStatus();" id="isHiddenStyle"
+                                   style="display: none">完成</a>
                             </div>
                         </div>
                     </div>
@@ -224,7 +234,8 @@
             data: {
                 taskTitle: $("#Qzinput").val(),
                 taskTarget: $("#qzf2").val(),
-                remark: $("#remarks").val()
+                remark: $("#remarks").val(),
+                userId: $('#userId').val(),
             },
             type: 'GET',
             success: function (data) {
@@ -253,11 +264,15 @@
     }
 
     //我的求助的页面展示
-    function qzMy_help(status) {
+    function qzMy_help(status, query) {
         $('#valueQz').empty();//清除节点
         $.ajax({
             url: '/home/home/queryQzTask',
-            data: {taskStatus: status},
+            data: {
+                taskStatus: status,
+                taskTitle: query,
+                userId: $('#userId').val()
+            },
             type: 'GET',
             success: function (data) {
                 console.log(data);
@@ -283,23 +298,32 @@
                 '                                        <p class="weui-media-box__desc">' + v.taskTitle + '</p>\n' +
                 '                                    </div>\n' +
                 '                                </div>\n' +
-                '                                <div class="weui-cell__ft"></div>\n' +
+                '                                <div class="weui-cell__ft">' + conversion(v.taskStatus) + '</div>\n' +
                 '                            </a><br />'));
     }
 
+    var aid;
+
     function myItemClick(v) {
         if ($('#familyDisplay')[0].style.display == 'none') {
             $('#familyDisplay')[0].style.display = '';
             $("#notPlay").toggle();
             $('#qzHS2').empty();
+
             $.ajax({
                 url: '/home/home/taskQuery',
                 data: {taskId: v.taskId},
                 type: 'GET',
                 success: function (data) {
                     console.log(data);
+                    //判断该求助是否完成  来判断按钮是否展示
+                    if (data.data.length > 0 && data.data[0].taskStatus == 2) {
+                        $('#isHiddenStyle')[0].style.display = '';
+                    } else {
+                        $('#isHiddenStyle')[0].style.display = 'none';
+                    }
+
                     if (data.data.length > 0) {
-                        hasData = true;
                         $('#qzHS2').append($('<div>' + data.data[0].taskTitle + '</div>'))
                         data.data.forEach(function (v) {
                             shValuenat2(v);
@@ -315,10 +339,11 @@
     }
 
     function shValuenat2(v) {
+        aid = v.taskId;
         $('#qzHS2').append($('<a href="javascript:void(0);" 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">业主1号</p>\n' +
+                '                        <p class="weui-media-box__desc">'+v.nickName+'</p>\n' +
                 '                        <p class="weui-media-box__desc">' + timestampToTime(v.timeUpdate) + '</p>\n' +
                 '                    </div>\n' +
                 '                    <div class="weui-cell ">\n' +
@@ -342,6 +367,23 @@
 
     }
 
+    //求助反馈完成
+    function HomeStatus() {
+        $.ajax({
+            url: '/home/qiuzhu/reply.json',
+            type: 'GET',
+            data: {
+                taskId: aid,
+            },
+            success: function (data) {
+                qzBackHome();
+            },
+            error: function () {
+            }
+        });
+    }
+
+    //只是单独的返回
     function qzBackHome() {
         if ($('#notPlay')[0].style.display == 'none') {
             $('#familyDisplay').toggle();
@@ -359,5 +401,15 @@
         /*展示*/
         $('#play')[0].style.display = '';
     }
+
+
+    //查询按钮
+    function queryQz() {
+        if ($("#Gj").val() != "off") {
+            qzMy_help('', $("#quetyFamily").val());
+        } else {
+            qzMy_help(3, $("#quetyFamily").val());
+        }
+    }
 </script>
 

whepi-ui/templates/home/qiuzhu.js

@@ -6,7 +6,7 @@ function shValue(v) {
   $('#qzHS').append($('<a href="javascript:void(0);" 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">业主1号</p>\n' +
+    '                        <p class="weui-media-box__desc">'+v.nickName+'</p>\n' +
     '                        <p class="weui-media-box__desc">' + timestampToTime(v.timeUpdate) + '</p>\n' +
     '                    </div>\n' +
     '                    <div class="weui-cell ">\n' +

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

@@ -14,11 +14,16 @@ public interface QzTaskDao extends BaseMapper<QzTask> {
 
   List<QzTask> selectAll();
 
-    QzTask queryByTaskId(Long taskId);
+  QzTask queryByTaskId(Long taskId);
 
-    List<QzTask> queryByHouseNumber(@Param("houseNumber") String houseNumber, @Param("status") Integer status);
+  List<QzTask> queryByHouseNumber(@Param("houseNumber") String houseNumber, @Param("status") Integer status);
 
-    Integer updateStatusById(@Param("taskId") Long taskId, @Param("status") Integer status);
+  Integer updateStatusById(@Param("taskId") Long taskId, @Param("status") Integer status);
 
-    List<QzTask> queryQzTask(@Param("taskStatus")Integer taskStatus);
+  List<QzTask> queryQzTask(@Param("taskStatus") Integer taskStatus, @Param("taskTitle") String taskTitle,@Param("userId")Long userId);
+
+  //当前用户名称
+  QzTask selectUserName(@Param("userId") Long userId);
+  //当前用户门牌id 门牌号
+  QzTask selectHome(@Param("userId") Long userId);
 }

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

@@ -54,7 +54,7 @@ public class QzTask implements Serializable {
     /**
      * 门牌号ID
      */
-    private String houseId;
+    private Long houseId;
 
     /**
      * 新增人

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

@@ -1,6 +1,7 @@
 package com.bofeng.entity;
 
 import lombok.Data;
+import org.joda.time.DateTime;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,42 +14,44 @@ public class QzTaskReply implements Serializable {
    */
   private Long replyId;
 
-    /**
-     * 求助ID
-     */
-    private Long taskId;
+  /**
+   * 求助ID
+   */
+  private Long taskId;
 
-    /**
-     * 回复用户ID
-     */
-    private Long userId;
+  /**
+   * 回复用户ID
+   */
+  private Long userId;
 
-    /**
-     * 回复内容
-     */
-    private String replyContent;
+  /**
+   * 回复内容
+   */
+  private String replyContent;
 
-    /**
-     * 新增人
-     */
-    private Long userCreate;
+  /**
+   * 新增人
+   */
+  private Long userCreate;
 
-    /**
-     * 新增时间
-     */
-    private Date timeCreate;
+  /**
+   * 新增时间
+   */
+  private DateTime timeCreate;
 
-    /**
-     * 修改人
-     */
-    private Long userUpdate;
+  /**
+   * 修改人
+   */
+  private Long userUpdate;
 
-    /**
-     * 修改时间
-     */
-    private Date timeUpdate;
+  /**
+   * 修改时间
+   */
+  private DateTime timeUpdate;
 
-    private String taskTitle;
+  private String taskTitle;
+  private Integer taskStatus;
+  private String nickName;
 
-    private static final long serialVersionUID = 1L;
+  private static final long serialVersionUID = 1L;
 }

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

@@ -16,43 +16,51 @@ import java.util.List;
 @Transactional(readOnly = true)
 public class QzTaskService {
 
-    @Autowired
-    private QzTaskDao qzTaskDao;
+  @Autowired
+  private QzTaskDao qzTaskDao;
 
-    public List<QzTask> selectAll () {
-        return qzTaskDao.selectAll();
-    }
+  public List<QzTask> selectAll() {
+    return qzTaskDao.selectAll();
+  }
 
-    public List<QzTask> queryByHouseNumber (String houseNumber, Integer status) {
-        return qzTaskDao.queryByHouseNumber(houseNumber, status);
-    }
+  public List<QzTask> queryByHouseNumber(String houseNumber, Integer status) {
+    return qzTaskDao.queryByHouseNumber(houseNumber, status);
+  }
 
-    public QzTask queryByTaskId (Long taskId) {
-        return qzTaskDao.queryByTaskId(taskId);
-    }
+  public QzTask queryByTaskId(Long taskId) {
+    return qzTaskDao.queryByTaskId(taskId);
+  }
 
   //求助的新增
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-  public int addHelp(String taskTitle,String taskTarget,String remark) {
-    var qzTak=new QzTask();
+  public int addHelp(String taskTitle, String taskTarget, String remark, Long userId) {
+    var qzTak = new QzTask();
     qzTak.setTaskId(IdWorker.getId());
     qzTak.setTaskTitle(taskTitle);
     qzTak.setRemark(remark);
     qzTak.setTaskTarget(taskTarget);
     qzTak.setTaskStatus(1);
-
-    /*long userId = Long.parseLong(JwtHelper.getUserId());
     qzTak.setUserId(userId);
-    qzTak.setUserCreate(userId);*/
+    //当前用户名称
+    qzTak.setUserName(qzTaskDao.selectUserName(userId).getUserName());
+    //当前用户的门牌id  门牌号
+    QzTask qzTask1 = qzTaskDao.selectHome(userId);
+    qzTak.setHouseId(qzTask1.getHouseId());
+    qzTak.setHouseNumber(qzTask1.getHouseNumber());
+    qzTak.setUserCreate(userId);
     qzTak.setTimeCreate(new DateTime());
-   /* qzTak.setUserUpdate(userId);*/
+    qzTak.setUserUpdate(userId);
     qzTak.setTimeUpdate(new DateTime());
     return qzTaskDao.insert(qzTak);
   }
 
 
+  public List<QzTask> queryQzTask(Integer taskStatus, String taskTitle, Long userId) {
+    return qzTaskDao.queryQzTask(taskStatus, taskTitle, userId);
+  }
 
-  public List<QzTask> queryQzTask(Integer taskStatus){
-    return qzTaskDao.queryQzTask(taskStatus);
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+  public int taskQueryTaskId(Long taskId) {
+    return qzTaskDao.updateStatusById(taskId, 3);//求助完成
   }
 }

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

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -48,21 +49,32 @@ public class HomeController {
 
   //家庭求助
   @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));
+  public ModelOps family(@Pd(name = "taskTitle") String taskTitle,
+                         @Pd(name = "taskTarget") String taskTarget,
+                         @Pd(name = "remark") String remark,
+                         @Pd(name = "userId", required = false) Long userId) {
+    return ModelOps.newSuccess(qzTaskService.addHelp(taskTitle, taskTarget, remark, userId));
   }
 
   //我的在求助的展示
   @GetMapping("/home/home/queryQzTask")
-  public Model<List<QzTask>> queryQzTask(@Pd(name = "taskStatus",required = false)Integer taskStatus){
-    return Model.newSuccess(qzTaskService.queryQzTask(taskStatus));
+  public Model<List<QzTask>> queryQzTask(@Pd(name = "taskStatus", required = false) Integer taskStatus,
+                                         @Pd(name = "taskTitle", required = false) String taskTitle,
+                                         @Pd(name = "userId", required = false) Long userId) {
+    return Model.newSuccess(qzTaskService.queryQzTask(taskStatus, taskTitle, userId));
   }
 
   //小区求助的查看
   @GetMapping("/home/home/taskQuery")
-  public Model<List<QzTaskReply>> taskQuery(@Pd(name = "taskId")Long taskId){
+  public Model<List<QzTaskReply>> taskQuery(@Pd(name = "taskId") Long taskId) {
     return Model.newSuccess(qzTaskReplyService.taskQuery(taskId));
   }
+
+
+  //页面存储taskId
+  @GetMapping("/home/qiuzhu/reply.json")
+  public ModelOps taskQueryTaskId(@RequestParam(value = "taskId") Long taskId) {
+    int i = qzTaskService.taskQueryTaskId(taskId);
+    return ModelOps.newSuccess(i);
+  }
 }

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

@@ -46,10 +46,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(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

@@ -23,8 +23,25 @@
             <if test="taskStatus!=null and taskStatus!=''">
                 task_status=#{taskStatus}
             </if>
+            <if test="taskTitle!=null and taskTitle!=''">
+                and task_title like concat('%',#{taskTitle},'%')
+            </if>
+            <if test="userId!=null and userId!=''">
+                and user_id=#{userId}
+            </if>
         </where>
         order by time_update desc
     </select>
 
+    <select id="selectUserName" resultType="com.bofeng.entity.QzTask">
+        select nick_name as userName from sys_user_open where user_id=#{userId} limit 1
+    </select>
+
+    <select id="selectHome" resultType="com.bofeng.entity.QzTask">
+        SELECT b.house_id ,b.doorplate as houseNumber
+        from sys_user_role a
+        INNER JOIN sys_uptown_house b on a.property_id=b.house_id
+        where a.user_id=#{userId}
+    </select>
+
 </mapper>

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

@@ -4,8 +4,10 @@
 
 
     <select id="taskQuery" resultType="com.bofeng.entity.QzTaskReply">
-     select * from qz_task a
+     select a.task_title,a.remark,b.time_update,c.nick_name,b.reply_content
+     from qz_task a
      INNER JOIN qz_task_reply b on a.task_id=b.task_id
+     left JOIN sys_user_open c on c.user_id=b.user_id
      where a.task_id=#{taskId}
     </select>
 </mapper>