解决bug

whepi-doc/task.sql

@@ -4,7 +4,7 @@
 drop table if exists qz_task;
 create table qz_task (
     task_id         bigint(20)      NOT NULL DEFAULT 0          COMMENT '求助任务ID',
-    task_target     varchar(20)     NOT NULL DEFAULT ''         COMMENT '求助对象：A业委会，B居委会，C物业，D志愿者',
+    task_target     varchar(20)     NOT NULL DEFAULT ''         COMMENT '求助对象：A管理员，B居委会，C物业，D志愿者',
     task_status     int(11)         NOT NULL DEFAULT 0          COMMENT '求助状态：1未解决，2处理中，3已处理',
     task_title      varchar(20)     NOT NULL DEFAULT ''         COMMENT '求助标题',
     remark          varchar(100)    NOT NULL DEFAULT ''         COMMENT '备注',

whepi-ui/templates/yeweihui/qiuzhu.js

@@ -8,7 +8,8 @@ function qiuzhu_init() {
       type: 'post',
       data: {
         houseNumber: $('#qz_searchNum1').val(),
-        status: 1
+        status: 1,
+        userId: $('#userId').val()
       },
       success: function (data) {
         makeList1(data.data);
@@ -26,7 +27,8 @@ function qiuzhu_init() {
       type: 'post',
       data: {
         houseNumber: $('#qz_searchNum2').val(),
-        status: 2
+        status: 2,
+        userId: $('#userId').val()
       },
       success: function (data) {
         makeList2(data.data);
@@ -44,7 +46,8 @@ function qiuzhu_init() {
       type: 'post',
       data: {
         houseNumber: $('#qz_searchNum3').val(),
-        status: 3
+        status: 3,
+        userId: $('#userId').val()
       },
       success: function (data) {
         makeList3(data.data);
@@ -97,7 +100,7 @@ function makeList1(tasks) {
         '                            <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.ridgepole + '-' + task.unit + '-' + task.houseNumber + '</p>\n' +
-        '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
+        '                                    <p class="weui-media-box__desc">' + task.timeCreate + '</p>\n' +
         '                                </div>\n' +
         '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
         '                                <p class="weui-media-box__desc">' + task.remark + '</p>\n' +
@@ -121,7 +124,7 @@ function makeList2(tasks) {
         '                            <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.ridgepole + '-' + task.unit + '-' + task.houseNumber + '</p>\n' +
-        '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
+        '                                    <p class="weui-media-box__desc">' + task.timeCreate + '</p>\n' +
         '                                </div>\n' +
         '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
         '                                <p class="weui-media-box__desc">' + task.remark + '</p>\n' +
@@ -146,7 +149,7 @@ function makeList3(tasks) {
         '                            <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.ridgepole + '-' + task.unit + '-' + task.houseNumber + '</p>\n' +
-        '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
+        '                                    <p class="weui-media-box__desc">' + task.timeCreate + '</p>\n' +
         '                                </div>\n' +
         '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
         '                                <p class="weui-media-box__desc">' + task.remark + '</p>\n' +

whepi-ui/templates/yeweihui/qiuzhuDetail.ftl

@@ -118,14 +118,14 @@
                 if (task.taskStatus == 2) {
                     for (let i = 0; i < data.data.length; i++) {
                         let reply = data.data[i];
-                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">回复' + i + '</p>\n' +
+                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">回复' + i+1 + '</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('<p class="weui-media-box__desc">回复' + i + '</p>\n' +
+                        $("#qz_done_detail").append('<p class="weui-media-box__desc">回复' + i+1 + '</p>\n' +
                             '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
                     }
                 }

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

@@ -18,11 +18,11 @@ public interface QzTaskDao extends BaseMapper<QzTask> {
 
     QzTask queryByTaskId(@Param("taskId") Long taskId);
 
-    List<QzTask> queryByHouseNumber(@Param("houseNumber") String houseNumber, @Param("status") Integer status);
+    List<QzTask> queryByHouseNumber(@Param("uptownId") Long uptownId, @Param("houseNumber") String houseNumber, @Param("status") Integer status);
 
     Integer updateStatusById(@Param("taskId") Long taskId, @Param("status") Integer status);
 
-    List<QzTask> queryQzTaskByStatus(@Param("taskStatus") Integer taskStatus);
+    List<QzTask> queryQzTaskByStatus(@Param("uptownId") Long uptownId, @Param("taskStatus") Integer taskStatus);
 
     List<QzTask> queryQzTask(@Param("taskStatus") Integer taskStatus, @Param("taskTitle") String taskTitle, @Param("userId") Long userId);
 

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

@@ -1,9 +1,10 @@
 package com.bofeng.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.joda.time.DateTime;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * qz_task
@@ -17,7 +18,7 @@ public class QzTask implements Serializable {
     private Long taskId;
 
     /**
-     * 求助对象：A业委会，B居委会，C物业，D志愿者
+     * 求助对象：A管理员，B居委会，C物业，D志愿者
      */
     private String taskTarget;
 
@@ -78,7 +79,8 @@ public class QzTask implements Serializable {
     /**
      * 新增时间
      */
-    private DateTime timeCreate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date timeCreate;
 
     /**
      * 修改人
@@ -88,7 +90,8 @@ public class QzTask implements Serializable {
     /**
      * 修改时间
      */
-    private DateTime timeUpdate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date timeUpdate;
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -6,12 +6,12 @@ import com.bofeng.dao.YeweihuiSysOwnerMapper;
 import com.bofeng.dao.YeweihuiUserRoleMapper;
 import com.bofeng.entity.QzTask;
 import lombok.var;
-import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -36,8 +36,12 @@ public class QzTaskService {
     return qzTaskDao.selectAll(uptownId);
   }
 
-  public List<QzTask> queryByHouseNumber(String houseNumber, Integer status) {
-    return qzTaskDao.queryByHouseNumber(houseNumber, status);
+  public List<QzTask> queryByHouseNumber(Long userId, String houseNumber, Integer status) {
+    Long propertyId = yeweihuiUserRoleMapper.queryPropertyIdByUserId(userId);
+
+    Long uptownId = yeweihuiSysOwnerMapper.queryUptownIdByUserId(propertyId);
+
+    return qzTaskDao.queryByHouseNumber(uptownId, houseNumber, status);
   }
 
   public QzTask queryByTaskId(Long taskId) {
@@ -63,14 +67,18 @@ public class QzTaskService {
     qzTak.setUptownId(qzTask1.getUptownId());
     qzTak.setHouseNumber(qzTask1.getHouseNumber());
     qzTak.setUserCreate(userId);
-    qzTak.setTimeCreate(new DateTime());
+    qzTak.setTimeCreate(new Date());
     qzTak.setUserUpdate(userId);
-    qzTak.setTimeUpdate(new DateTime());
+    qzTak.setTimeUpdate(new Date());
     return qzTaskDao.insert(qzTak);
   }
 
-  public List<QzTask> queryQzTaskByStatus(Integer taskStatus) {
-    return qzTaskDao.queryQzTaskByStatus(taskStatus);
+  public List<QzTask> queryQzTaskByStatus(Long userId, Integer taskStatus) {
+    Long propertyId = yeweihuiUserRoleMapper.queryPropertyIdByUserId(userId);
+
+    Long uptownId = yeweihuiSysOwnerMapper.queryUptownIdByUserId(propertyId);
+
+    return qzTaskDao.queryQzTaskByStatus(uptownId, taskStatus);
   }
 
   public List<QzTask> queryQzTask(Integer taskStatus, String taskTitle, Long userId) {

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

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.View;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -66,10 +65,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(1225321682867105793L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+//            UserOpen userOpen = homeService.getUserOpen();
+//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");

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

@@ -82,10 +82,10 @@ public class YeWeiHuiController {
   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志愿者
+//        A管理员，B居委会，C物业，D志愿者
     StringBuffer target = new StringBuffer();
     if (task.getTaskTarget().equals("A")) {
-      target.append("业委会");
+      target.append("管理员");
     } else if (task.getTaskTarget().equals("B")) {
       if (target.length() > 0) {
         target.append("、居委会");
@@ -115,13 +115,13 @@ public class YeWeiHuiController {
     return new ModelAndView("/yeweihui/qiuzhuDetail.ftl", model);
   }
 
-  @PostMapping("/yeweihui/qiuzhu/queryTasksByStatus.json")
-  public Model queryTasksByStatus(@Pd(name = "status") Integer status) {
-
-    List<QzTask> taskList = qzTaskService.queryQzTaskByStatus(status);
-
-    return Model.newSuccess(taskList);
-  }
+//  @PostMapping("/yeweihui/qiuzhu/queryTasksByStatus.json")
+//  public Model queryTasksByStatus(@Pd(name = "status") Integer status) {
+//
+//    List<QzTask> taskList = qzTaskService.queryQzTaskByStatus(status);
+//
+//    return Model.newSuccess(taskList);
+//  }
 
   @PostMapping("/yeweihui/qiuzhu/reply/add.json")
   public ModelOps replyQiuzhuInsert(QzTaskReply qzTaskReply) {
@@ -144,13 +144,13 @@ public class YeWeiHuiController {
   }
 
   @PostMapping("/yeweihui/qiuzhu/list.json")
-  public Model queryByHouseNumber(String houseNumber, @Pd(name = "status") Integer status) {
+  public Model queryByHouseNumber(@Pd(name = "userId") Long userId, String houseNumber, @Pd(name = "status") Integer status) {
 
     if (houseNumber.length() <= 0) {
-      return Model.newSuccess(qzTaskService.queryQzTaskByStatus(status));
+      return Model.newSuccess(qzTaskService.queryQzTaskByStatus(userId, status));
     }
 
-    List<QzTask> list = qzTaskService.queryByHouseNumber(houseNumber, status);
+    List<QzTask> list = qzTaskService.queryByHouseNumber(userId, houseNumber, status);
 
     return Model.newSuccess(list);
   }

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

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

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

@@ -11,6 +11,7 @@
         ) c
     LEFT JOIN sys_uptown_unit d
     ON c.unit_id=d.unit_id
+    order by c.time_create desc
   </select>
 
     <select id="queryByTaskId" resultType="com.bofeng.entity.QzTask">
@@ -18,7 +19,16 @@
   </select>
 
     <select id="queryByHouseNumber" resultType="com.bofeng.entity.QzTask">
-    select * from qz_task where task_status=#{status} and house_number like concat('%', #{houseNumber}, '%')
+    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} and task_status=#{status} and house_number like concat('%', #{houseNumber}, '%')
+        ) c
+            LEFT JOIN sys_uptown_unit d
+                      ON c.unit_id=d.unit_id
+    order by c.time_create desc
   </select>
 
     <update id="updateStatusById">
@@ -26,7 +36,16 @@
   </update>
 
     <select id="queryQzTaskByStatus" resultType="com.bofeng.entity.QzTask">
-        select * from qz_task where task_status=#{taskStatus}
+        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} and task_status=#{taskStatus}
+            ) c
+                LEFT JOIN sys_uptown_unit d
+                          ON c.unit_id=d.unit_id
+        order by c.time_create desc
     </select>
 
     <select id="queryQzTask" resultType="com.bofeng.entity.QzTask">