1. 栋和单元展示问题解决

2. 求助回复页面返回刷新的问题

whepi-ui/templates/yeweihui/qiuzhu.js

@@ -96,7 +96,7 @@ function makeList1(tasks) {
     $('#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' +
+        '                                    <p class="weui-media-box__desc">' + task.ridgepole + '-' + task.unit + '-' + task.houseNumber + '</p>\n' +
         '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
         '                                </div>\n' +
         '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
@@ -120,7 +120,7 @@ function makeList2(tasks) {
     $('#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' +
+        '                                    <p class="weui-media-box__desc">' + task.ridgepole + '-' + task.unit + '-' + task.houseNumber + '</p>\n' +
         '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
         '                                </div>\n' +
         '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
@@ -145,7 +145,7 @@ function makeList3(tasks) {
     $('#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' +
+        '                                    <p class="weui-media-box__desc">' + task.ridgepole + '-' + task.unit + '-' + task.houseNumber + '</p>\n' +
         '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
         '                                </div>\n' +
         '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
@@ -157,4 +157,5 @@ function makeList3(tasks) {
 
 function itemSelect(taskId) {
   window.location.href = "/yeweihui/qiuzhuDetail.html?taskId=" + taskId + "&userId=" + $('#userId').val();
+  // window.location.href = "/yeweihui/qiuzhuDetail.html?taskId=" + taskId + "&userId=" + '1225321682867105793';
 }

whepi-ui/templates/yeweihui/qiuzhuDetail.ftl

@@ -42,7 +42,7 @@
         <div class="weui-popup__modal">
             <div class="weui-btn-area">
                 <div style="display:flex; flex-direction: row; justify-content: space-between;">
-                    <div style="width: 80%;"></div>
+                    <div style="width: 75%;"></div>
                     <a class="weui-btn weui-btn_primary" style="margin-bottom: 3vh;" href="javascript:close();">关闭</a>
             </div>
                 <textarea id="qz_content" class="weui-textarea" placeholder="请输入文本" rows="5"></textarea>
@@ -93,7 +93,7 @@
             },
             success: function (data) {
                 $.closePopup();
-                history.back();
+                window.location.href = "/yeweihui/home.html?userId=" + userId;
             },
             error: function () {
                 $.alert("网络异常");
@@ -102,7 +102,7 @@
     }
 
     function goback() {
-        history.back();
+        window.location.href = "/yeweihui/home.html?userId=" + userId;
     }
 
     function getdealdetail() {

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

@@ -14,9 +14,9 @@ import java.util.Map;
 @Repository
 public interface QzTaskDao extends BaseMapper<QzTask> {
 
-    List<QzTask> selectAll(Long uptownId);
+    List<QzTask> selectAll(@Param("uptownId") Long uptownId);
 
-    QzTask queryByTaskId(Long taskId);
+    QzTask queryByTaskId(@Param("taskId") Long taskId);
 
     List<QzTask> queryByHouseNumber(@Param("houseNumber") String houseNumber, @Param("status") Integer status);
 

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

@@ -1,10 +1,10 @@
 package com.bofeng.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 import org.joda.time.DateTime;
 
+import java.io.Serializable;
+
 /**
  * qz_task
  * @author 
@@ -60,6 +60,15 @@ public class QzTask implements Serializable {
      * 小区id
      */
     private Long uptownId;
+    /**
+     * 栋
+     */
+    private String ridgepole;
+    /**
+     * 单元
+     */
+    private String unit;
+
 
     /**
      * 新增人

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

@@ -8,9 +8,11 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.yvan.platform.JsonWapper;
 import com.yvan.platform.YvanUtil;
 import com.yvan.springmvc.ResultModel;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -60,10 +62,10 @@ public class UserOpenController {
                              @RequestParam(value = "userType", required = false,defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-            UserOpen userOpen = homeService.getUserOpen();
-            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//            list = userRoleMapper.getUserRoleByUserId(13131L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(13131L);
+//            UserOpen userOpen = homeService.getUserOpen();
+//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+            list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
+            UserOpen userOpen = userOpenMapper.selectByUserId(1224239062748065800L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");

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

@@ -1,13 +1,9 @@
 package com.bofeng.wx.controller;
 
 import com.bofeng.dao.RbMapper;
-import com.bofeng.entity.QzTask;
-import com.bofeng.entity.QzTaskReply;
-import com.bofeng.entity.SysUptownHouse;
-import com.bofeng.entity.sysUptownUnit;
+import com.bofeng.entity.*;
 import com.bofeng.excel.ExcelUtils;
 import com.bofeng.service.HomeService;
-import com.bofeng.entity.*;
 import com.bofeng.service.QzTaskReplyService;
 import com.bofeng.service.QzTaskService;
 import com.bofeng.service.RbService;
@@ -20,7 +16,6 @@ import com.yvan.platform.JsonWapper;
 import com.yvan.platform.YvanUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -52,15 +46,17 @@ public class YeWeiHuiController {
     private RbMapper rbMapper;
 
     @GetMapping("/yeweihui/home.html")
-    public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) {
+    public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId") Long userId) {
 
         Map<String, Object> queryParam = Maps.newLinkedHashMap();
-        queryParam.put("userId", "12345677");
-        queryParam.put("statistics", "M");
-
-//        List<QzTask> taskList = qzTaskService.selectAll(2L);
-        List<sysUptownUnit> rbList = rbService.selectAll(1225331049509187586L);
-//        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+        queryParam.put("user_id", userId);
+//        queryParam.put("statistics", "M");
+
+//        List<QzTask> taskList = qzTaskService.selectAll(1225321682867105793L);
+//        List<sysUptownUnit> rbList = rbService.selectAll(1225321682867105793L);
+        List<QzTask> taskList = qzTaskService.selectAll(userId);
+        List<sysUptownUnit> rbList = rbService.selectAll(userId);
+        model.put("taskList", YvanUtil.toJsonPretty(taskList));
         model.put("rbList", YvanUtil.toJsonPretty(rbList));
 
         return new ModelAndView("/yeweihui/home.ftl", model);

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

@@ -2,7 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bofeng.dao.QzTaskDao">
     <select id="selectAll" resultType="com.bofeng.entity.QzTask">
-    select * from qz_task where uptown_id=#{uptownId}
+    select c.*, d.ridgepole, d.unit FROM
+        (
+            select a.*, b.unit_id from qz_task a
+            LEFT JOIN sys_uptown_house b
+            ON (a.house_id=b.house_id)
+            WHERE a.uptown_id=#{uptownId}
+        ) c
+    LEFT JOIN sys_uptown_unit d
+    ON c.unit_id=d.unit_id
   </select>
 
     <select id="queryByTaskId" resultType="com.bofeng.entity.QzTask">