修改bug

huanghongfa

2021-07-16 db31c68b10e3a58bce17e3bbf880db05b6f341fe

修改bug

 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;

}

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

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

    /**

 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