From db31c68b10e3a58bce17e3bbf880db05b6f341fe Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 16:39:56 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsVO.java | 6 ++++++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml | 36 +++++++++++++++++++++++++++++++++---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 7 ++++++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 2 +-
4 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsVO.java
index 150d468..8129c69 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsVO.java
@@ -34,4 +34,10 @@
@ApiModelProperty("实有房屋总数")
private Integer houseTotal = 0;
+ @ApiModelProperty("走访任务当日完成数量")
+ private Integer zfTodayNum = 0;
+
+ @ApiModelProperty("走访任务当月完成数量")
+ private Integer zfMonthNum = 0;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
index 8b2cb6c..1fc4a73 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -71,7 +71,7 @@
"AND w.`status` = #{comActMicroWishVO.status} " +
" </if> " +
"<if test='comActMicroWishVO.status == 3 and comActMicroWishVO.isPageMyWish==null'>" +
- "AND ( w.`status` = 3 or w.`status` = 5 ) " +
+ "AND w.`status` = 3 " +
" </if> " +
"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" +
"AND w.`status` =1 " +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index 5b517fd..8f0aefd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -1923,7 +1923,12 @@
*/
@Override
public R getGridEventStatisticsByApp(Long gridId){
- return R.ok(this.baseMapper.getGridEventStatisticsByApp(gridId));
+ GridEventStatisticsVO result = this.baseMapper.getGridEventStatisticsByApp(gridId);
+ if(result != null){
+ result.setTodayNum(result.getTodayNum() + result.getZfTodayNum());
+ result.setMonthNum(result.getMonthNum() + result.getZfMonthNum());
+ }
+ return R.ok(result);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
index dd979a5..e9b3110 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -598,7 +598,10 @@
AND grid_id = #{gridId}
</if>
) AS todayEducationNum,
- ( SELECT count( id ) FROM `event` WHERE event_category = 2 AND event_status = 2 ) AS educationNum,
+ ( SELECT count( id ) FROM `event` WHERE event_category = 2 AND event_status = 2
+ <if test="gridId!=null">
+ AND grid_id = #{gridId}
+ </if>) AS educationNum,
(
SELECT
count( id )
@@ -615,7 +618,10 @@
AND grid_id = #{gridId}
</if>
) AS todaySpecialTotal,
- ( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND event_process_status = 2 ) AS specialTotal,
+ ( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND event_process_status = 2
+ <if test="gridId!=null">
+ AND grid_id = #{gridId}
+ </if>) AS specialTotal,
(
SELECT
count( cmph.id )
@@ -626,7 +632,31 @@
<if test="gridId!=null">
egd.id = #{gridId}
</if>
- ) AS houseTotal
+ ) AS houseTotal,
+ (
+ SELECT
+ count( id )
+ FROM
+ event_visiting_tasks
+ WHERE
+ event_status = 2 AND submit_date BETWEEN DATE_FORMAT( CURDATE(), '%Y-%m-%d %H:%i:%s' )
+ AND NOW()
+ <if test="gridId!=null">
+ AND grid_id = #{gridId}
+ </if>
+ ) as zfTodayNum,
+ (
+ SELECT
+ count( id )
+ FROM
+ event_visiting_tasks
+ WHERE
+ event_status = 2 AND submit_date BETWEEN DATE_FORMAT( DATE_ADD( curdate(), INTERVAL - DAY ( curdate())+ 1 DAY ), '%Y-%m-%d %H:%i:%s' )
+ AND NOW()
+ <if test="gridId!=null">
+ AND grid_id = #{gridId}
+ </if>
+ ) as zfMonthNum
FROM
`event`
WHERE
--
Gitblit v1.7.1