Merge remote-tracking branch 'origin/master'

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-web/src/main/java/com/bofeng/dao/QzTaskDao.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @Repository
@@ -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

@@ -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/WuYeController.java

@@ -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/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

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