求助暂停工作

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/yeweihui/qiuzhu.ftl

@@ -1,4 +1,7 @@
 <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%;" />-->
@@ -22,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/qiuzhuDetail.ftl

@@ -89,7 +89,7 @@
             },
             success: function (data) {
                 $.closePopup();
-                window.location.href = "/yeweihui/home.html";
+                history.back();
             },
             error: function () {
                 $.alert("网络异常");

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

@@ -13,7 +13,7 @@ import java.util.List;
 @Repository
 public interface QzTaskDao extends BaseMapper<QzTask> {
 
-    List<QzTask> selectAll();
+    List<QzTask> selectAll(Long uptownId);
 
     QzTask queryByTaskId(Long taskId);
 

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) {

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));

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

@@ -3,6 +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;
@@ -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;
@@ -47,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));

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">