guojing 5 gadi atpakaļ
vecāks
revīzija
afe3a5f3ae

+ 1 - 1
whepi-ui/templates/home/home.ftl

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

+ 1 - 1
whepi-ui/templates/shop/home.ftl

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

+ 1 - 1
whepi-ui/templates/shop/qiuzhu.ftl

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

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

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

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

@@ -46,6 +46,8 @@ public class QzTaskService {
     //当前用户的门牌id  门牌号
     //当前用户的门牌id  门牌号
     QzTask qzTask1 = qzTaskDao.selectHome(userId);
     QzTask qzTask1 = qzTaskDao.selectHome(userId);
     qzTak.setHouseId(qzTask1.getHouseId());
     qzTak.setHouseId(qzTask1.getHouseId());
+    //获取当前小区id
+    qzTak.setUptownId(qzTask1.getUptownId());
     qzTak.setHouseNumber(qzTask1.getHouseNumber());
     qzTak.setHouseNumber(qzTask1.getHouseNumber());
     qzTak.setUserCreate(userId);
     qzTak.setUserCreate(userId);
     qzTak.setTimeCreate(new DateTime());
     qzTak.setTimeCreate(new DateTime());

+ 1 - 0
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.QzTask;
 import com.bofeng.entity.QzTaskReply;
 import com.bofeng.entity.QzTaskReply;
 import com.bofeng.entity.SysUptownHouse;
 import com.bofeng.entity.SysUptownHouse;
+import com.bofeng.entity.sysUptownUnit;
 import com.bofeng.service.HomeService;
 import com.bofeng.service.HomeService;
 import com.bofeng.service.QzTaskReplyService;
 import com.bofeng.service.QzTaskReplyService;
 import com.bofeng.service.QzTaskService;
 import com.bofeng.service.QzTaskService;

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

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

+ 3 - 2
whepi-web/src/main/resources/mapper/QzTaskDao.xml

@@ -42,9 +42,10 @@
     </select>
     </select>
 
 
     <select id="selectHome" resultType="com.bofeng.entity.QzTask">
     <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_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
         where a.user_id=#{userId} limit 1
     </select>
     </select>