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

whepi-doc/task.sql

@@ -12,6 +12,7 @@ create table qz_task (
     user_name       varchar(20)     NOT NULL DEFAULT ''         COMMENT '用户名称',
     house_number    varchar(20)     NOT NULL DEFAULT ''         COMMENT '门牌号',
     house_id        varchar(20)     NOT NULL DEFAULT ''         COMMENT '门牌号ID',
+    uptown_id       bigint(20)      NOT NULL DEFAULT 0          COMMENT '小区ID,下拉选ID',
 
     user_create     bigint(20)      NOT NULL DEFAULT 0          COMMENT '新增人',
     time_create     datetime(0)     NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',

whepi-ui/templates/home/home.ftl

@@ -89,7 +89,7 @@
         $('#notitle').empty();//清除节点
         $.ajax({
             url: '/home/home/queryQzTask',
-            data: {},
+            data: {userId: $('#userId').val()},
             type: 'GET',
             async: false,
             success: function (data) {

whepi-ui/templates/shop/home.ftl

@@ -86,7 +86,7 @@
         $.ajax({
             url: '/home/home/queryQzTask',
             // data: {},
-            data: {taskStatus: 1},
+            data: {taskStatus: 1,userId: $('#userId').val()},
             type: 'GET',
             success: function (data) {
                 console.log(data);

whepi-ui/templates/shop/qiuzhu.ftl

@@ -235,7 +235,7 @@
         $('#valueQz').empty();//清除节点
         $.ajax({
             url: '/home/home/queryQzTask',
-            data: {taskStatus: status},
+            data: {userId: $('#userId').val(),taskStatus: status},
             type: 'GET',
             success: function (data) {
                 console.log(data);

whepi-ui/templates/wuye/qiuzhu.js

@@ -1,12 +1,14 @@
 function qiuzhu_init() {
+  //统计求助及处理数据
   analyData();
+  //求组信息列表
 }
 
 function analyData() {
   $('#userHelpAnaly').empty();//清除节点
   $.ajax({
     url: '/wuye/userHelpAnaly',
-    data: {queryDate: '2020-02-05'},
+    data: {queryDate: '2020-02-05', userId: 0},
     type: 'GET',
     success: function (data) {
       console.log(data);
@@ -25,30 +27,16 @@ function analyData() {
 function getHelpData(data) {
   $('#userHelpAnaly').append($('<div class="weui-flex"> \n' +
     '                   <div class="weui-flex__item">\n' +
-    '                       <div class="placeholder">今日新增</div>\n' +
-    '                       <div>' + data.todayAdd + '</div>\n' +
+    '                       <div class="placeholder">已解决总数</div>\n' +
+    '                       <div>' + data.totalDo + '</div>\n' +
     '                   </div>\n' +
     '                   <div class="weui-flex__item">\n' +
-    '                       <div class="placeholder">今日已处理</div>\n' +
-    '                       <div>' + data.todayDo + '</div>\n' +
+    '                       <div class="placeholder">已处理总数</div>\n' +
+    '                       <div>' + data.totalDoing + '</div>\n' +
     '                   </div>\n' +
     '                   <div class="weui-flex__item">\n' +
-    '                   <div class="placeholder">今日未处理</div>\n' +
-    '                       <div>' + data.todayDonot + '</div>\n' +
-    '                   </div>\n' +
-    '               </div>\n' +
-    '               <div class="weui-flex"> \n' +
-    '                   <div class="weui-flex__item">\n' +
-    '                       <div class="placeholder">近30天新增</div>\n' +
-    '                       <div>' + data.monthAdd + '</div>\n' +
-    '                   </div>\n' +
-    '                   <div class="weui-flex__item">\n' +
-    '                       <div class="placeholder">近30天已处理</div>\n' +
-    '                       <div>' + data.monthDo + '</div>\n' +
-    '                   </div>\n' +
-    '                   <div class="weui-flex__item">\n' +
-    '                   <div class="placeholder">近30天未处理</div>\n' +
-    '                       <div>' + data.monthDonot + '</div>\n' +
+    '                   <div class="placeholder">未处理总数</div>\n' +
+    '                       <div>' + data.totalDonot + '</div>\n' +
     '                   </div>\n' +
     '               </div>'));
 }

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,18 @@
 <div class="page__bd">
+    <header class="demos-header">
+        <h1 class="demos-title">社区求助</h1>
+    </header>
+<#--    <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">
@@ -11,7 +25,7 @@
                 已处理
             </a>
         </div>
-        <div class="weui-tab__panel">
+        <div class="weui-tab__panel content">
             <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
 
                 <div class="weui-btn-area"  style="display: flex; flex-direction: row; justify-content: space-between;">

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();
+                history.back();
             },
             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/dao/QzTaskDao.java

@@ -8,12 +8,13 @@ import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @Repository
 public interface QzTaskDao extends BaseMapper<QzTask> {
 
-    List<QzTask> selectAll();
+    List<QzTask> selectAll(Long uptownId);
 
     QzTask queryByTaskId(Long taskId);
 
@@ -31,13 +32,15 @@ public interface QzTaskDao extends BaseMapper<QzTask> {
     //当前用户门牌id 门牌号
     QzTask selectHome(@Param("userId") Long userId);
 
-    @Select("select count(1) from qz_task where DATE_FORMAT(time_create,'%Y-%m-%d')=#{queryDate}\n" +
-            "union all select count(1) from qz_task where DATE_FORMAT(time_create,'%Y-%m-%d')=#{queryDate} and task_status=3\n" +
-            "union all select count(1) from qz_task where DATE_FORMAT(time_create,'%Y-%m-%d')=#{queryDate} and task_status in (1,2)\n" +
-            "union all select count(1) from qz_task where time_create BETWEEN date_add(#{queryDate}, interval -30 day) and date_add(#{queryDate}, interval 1 day)\n" +
-            "union all select count(1) from qz_task where time_create BETWEEN date_add(#{queryDate}, interval -30 day) and date_add(#{queryDate}, interval 1 day) and task_status=3\n" +
-            "union all select count(1) from qz_task where time_create BETWEEN date_add(#{queryDate}, interval -30 day) and date_add(#{queryDate}, interval 1 day) and task_status in (1,2);\n" +
-            "")
-    List<Long> queryUserHelpAnaly(@Param("queryDate") String queryDate);
+    // todo 当用户是物业角色时的role_id尚未确认
+    @Select("SELECT task_status,count(1) as num from qz_task a \n" +
+            "inner join sys_uptown_house b on b.house_id=a.house_id\n" +
+            "inner join sys_uptown_unit c on c.unit_id=b.unit_id\n" +
+            "inner join sys_uptown d on d.uptown_id=c.uptown_id\n" +
+            //"where d.uptown_id=#{uptownId} and DATE_FORMAT(a.time_create,'%Y-%m-%d')=#{queryDate}\n" +
+            //"where \n" +
+            //"d.uptown_id in (select property_id from sys_user_role where role_id=4 and user_id=#{userId})\n" +
+            "group by task_status")
+    List<Map> queryUserHelpAnaly(@Param("userId") Long userId, @Param("queryDate") String queryDate);
 
 }

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

@@ -57,6 +57,11 @@ public class QzTask implements Serializable {
     private Long houseId;
 
     /**
+     * 小区id
+     */
+    private Long uptownId;
+
+    /**
      * 新增人
      */
     private Long userCreate;

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

@@ -41,4 +41,19 @@ public class UserHelpAnaly implements Serializable {
      */
     private Long monthDonot;
 
+    /**
+     * 已解决总数
+     */
+    private Long totalDo = 0L;
+
+    /**
+     * 已处理总数
+     */
+    private Long totalDoing = 0L;
+
+    /**
+     * 未处理总数
+     */
+    private Long totalDonot = 0L;
+
 }

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

@@ -19,8 +19,8 @@ public class QzTaskService {
   @Autowired
   private QzTaskDao qzTaskDao;
 
-  public List<QzTask> selectAll() {
-    return qzTaskDao.selectAll();
+  public List<QzTask> selectAll(Long uptownId) {
+    return qzTaskDao.selectAll(uptownId);
   }
 
   public List<QzTask> queryByHouseNumber(String houseNumber, Integer status) {
@@ -46,6 +46,8 @@ public class QzTaskService {
     //当前用户的门牌id  门牌号
     QzTask qzTask1 = qzTaskDao.selectHome(userId);
     qzTak.setHouseId(qzTask1.getHouseId());
+    //获取当前小区id
+    qzTak.setUptownId(qzTask1.getUptownId());
     qzTak.setHouseNumber(qzTask1.getHouseNumber());
     qzTak.setUserCreate(userId);
     qzTak.setTimeCreate(new DateTime());

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

@@ -2,11 +2,13 @@ package com.bofeng.service;
 
 import com.bofeng.dao.QzTaskDao;
 import com.bofeng.entity.UserHelpAnaly;
+import com.yvan.platform.Conv;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Transactional(readOnly = true)
@@ -15,16 +17,26 @@ public class WuYeService {
     @Autowired
     private QzTaskDao qzTaskDao;
 
-    public UserHelpAnaly queryUserHelpAnaly(String queryDate) {
+    public UserHelpAnaly queryUserHelpAnaly(Long userId, String queryDate) {
         UserHelpAnaly userHelpAnaly = new UserHelpAnaly();
-        List<Long> lstAnaly = qzTaskDao.queryUserHelpAnaly(queryDate);
-        if (lstAnaly != null && lstAnaly.size() == 6) {
-            userHelpAnaly.setTodayAdd(lstAnaly.get(0));
-            userHelpAnaly.setTodayDo(lstAnaly.get(1));
-            userHelpAnaly.setTodayDonot(lstAnaly.get(2));
-            userHelpAnaly.setMonthAdd(lstAnaly.get(3));
-            userHelpAnaly.setMonthDo(lstAnaly.get(4));
-            userHelpAnaly.setMonthDonot(lstAnaly.get(5));
+        List<Map> lstAnaly = qzTaskDao.queryUserHelpAnaly(userId, queryDate);
+        String status = "";
+        if (lstAnaly != null && lstAnaly.size() > 0) {
+            for (Map map : lstAnaly) {
+                status = map.get("task_status").toString();
+                if (status.equals("3")) {
+                    userHelpAnaly.setTotalDo(Conv.NL(map.get("num")));
+                    continue;
+                }
+                if (status.equals("2")) {
+                    userHelpAnaly.setTotalDoing(Conv.NL(map.get("num")));
+                    continue;
+                }
+                if (status.equals("1")) {
+                    userHelpAnaly.setTotalDonot(Conv.NL(map.get("num")));
+                    continue;
+                }
+            }
         }
         return userHelpAnaly;
     }

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

@@ -50,10 +50,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(123L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(123L);
+//            UserOpen userOpen = homeService.getUserOpen();
+//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+            list = userRoleMapper.getUserRoleByUserId(1225325493987995649L);
+            UserOpen userOpen = userOpenMapper.selectByUserId(1225325493987995649L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");
@@ -92,7 +92,7 @@ public class UserOpenController {
                 model.put("msReport", new JsonWapper(msReport));
                 return new ModelAndView("/home/home.ftl", model);
             } else if (userType == 2) {
-                List<QzTask> taskList = qzTaskService.selectAll();
+                List<QzTask> taskList = qzTaskService.selectAll(2L);
                 model.put("taskList", YvanUtil.toJsonPretty(taskList));
                 List<sysUptownUnit> rbList = rbService.selectAll(userId);
                 model.put("rbList", YvanUtil.toJsonPretty(rbList));

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

@@ -37,7 +37,7 @@ public class WuYeController {
         queryParam.put("userId", "12345677");
         queryParam.put("statistics", "M");
 
-        List<QzTask> taskList = qzTaskService.selectAll();
+        List<QzTask> taskList = qzTaskService.selectAll(2L);
 //        List<sysUptownUnit> rbList = rbService.selectAll();
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
 //        model.put("rbList", YvanUtil.toJsonPretty(rbList));
@@ -67,8 +67,8 @@ public class WuYeController {
 
     //小区求助的查看
     @GetMapping("/wuye/userHelpAnaly")
-    public Model<UserHelpAnaly> taskQuery(@Pd(name = "queryDate") String queryDate) {
-        return Model.newSuccess(wuYeService.queryUserHelpAnaly(queryDate));
+    public Model<UserHelpAnaly> taskQuery(@Pd(name = "queryDate") String queryDate, @Pd(name = "userId") Long userId) {
+        return Model.newSuccess(wuYeService.queryUserHelpAnaly(userId, queryDate));
     }
 
 }

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

@@ -4,6 +4,7 @@ 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;
@@ -14,7 +15,6 @@ import com.yvan.ModelOps;
 import com.yvan.mvc.Pd;
 import com.yvan.platform.JsonWapper;
 import com.yvan.platform.YvanUtil;
-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;
@@ -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) {
 
@@ -44,7 +47,7 @@ public class YeWeiHuiController {
         queryParam.put("userId", "12345677");
         queryParam.put("statistics", "M");
 
-        List<QzTask> taskList = qzTaskService.selectAll();
+        List<QzTask> taskList = qzTaskService.selectAll(2L);
         List<sysUptownUnit> rbList = rbService.selectAll(1224706869998772226L);
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
         model.put("rbList", YvanUtil.toJsonPretty(rbList));
@@ -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);
     }
 

whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: lll
+  profiles.active: guojing
 
   application:
     name: whepi-web

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

@@ -2,7 +2,7 @@
 <!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
+    select * from qz_task where uptown_id=#{uptownId}
   </select>
 
     <select id="queryByTaskId" resultType="com.bofeng.entity.QzTask">
@@ -42,9 +42,10 @@
     </select>
 
     <select id="selectHome" resultType="com.bofeng.entity.QzTask">
-        SELECT b.house_id ,b.doorplate as houseNumber
-        from sys_user_role a
+        select b.house_id ,b.doorplate as houseNumber,c.uptown_id
+        FROM sys_user_role a
         INNER JOIN sys_uptown_house b on a.property_id=b.house_id
+        INNER JOIN sys_uptown_unit c on c.unit_id=b.unit_id
         where a.user_id=#{userId} limit 1
     </select>