lidongdong
2022-10-21 a1493604668d4389cb0c98cd5a57513927e43a73
修改【统计】计算有问题 bug
10个文件已修改
76 ■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/UserController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/IGuideEvolveService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/GuideEvolveMapper.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
@@ -160,9 +160,9 @@
        if(allNum!=0)
        {
            //        回复率=最新进展里0条回复的导办工单数量/总工单数量
            //        回复率=最新进展里大于0条回复的导办工单数量/总工单数量
            //状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复   10转派    11手动分配)
            String reversionRate=weekDf.format((float)(iGuideEvolveService.countStatisticsNum("9",null)/(float)allNum));
            String reversionRate=weekDf.format((float)(homeStatisticsService.reversionRate("9",null)/(float)allNum));
            entity.setReversionRate(reversionRate);
        }
flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -334,8 +334,6 @@
            return error("输入密码与原密码不能相同!");
        }
        return toAjax(IUserService.updateConfig(config));
    }
flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java
@@ -49,10 +49,6 @@
    int updateGuid();
    /**
     * 首页统计用
     * @return
     */
    int countStatisticsNum(@Param("state") String state,@Param("isTimeout") String isTimeout);
}
flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java
@@ -90,4 +90,11 @@
    List<String> countId(String district);
    /**
     * 首页统计用
     * @return
     */
    int reversionRate(@Param("state") String state,@Param("isTimeout") String isTimeout);
}
flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java
@@ -87,4 +87,10 @@
    List<String> countId(String district);
    /**
     * 首页统计用
     * @return
     */
    int reversionRate(String state,String isTimeout);
}
flower_city/src/main/java/com/dg/core/service/IGuideEvolveService.java
@@ -46,9 +46,5 @@
     * @return
     */
    int updateGuid();
    /**
     * 首页统计用
     * @return
     */
    int countStatisticsNum(String state,String isTimeout);
}
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
@@ -65,10 +65,6 @@
        return baseMapper.updateGuid();
    }
    @Override
    public int countStatisticsNum(String state, String isTimeout) {
        return baseMapper.countStatisticsNum(state,isTimeout);
    }
}
flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
@@ -80,5 +80,9 @@
        return baseMapper.countId(district);
    }
    @Override
    public int reversionRate(String state, String isTimeout) {
        return baseMapper.reversionRate(state,isTimeout);
    }
}
flower_city/src/main/resources/mapper/GuideEvolveMapper.xml
@@ -137,24 +137,6 @@
        select count(id) from automessage_guide_evolve
    </select>
    <!--  首页统计使用 勿动  -->
    <select id="countStatisticsNum" resultType="integer">
        select count(id) from automessage_guide_evolve
        <where>
            <if test="state != null and state != ''">
                and automessage_guide_evolve.state=#{state}
            </if>
            <if test="isTimeout != null and isTimeout != ''">
                and automessage_guide_evolve.is_timeout=#{isTimeout}
            </if>
        </where>
    </select>
</mapper>
flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml
@@ -137,4 +137,23 @@
    </select>
    <!--  首页统计使用 勿动  -->
    <select id="reversionRate" resultType="integer">
        select SUM(m.num) from (
            select count(id) as num  from automessage_guide_evolve
            <where>
                <if test="state != null and state != ''">
                    and automessage_guide_evolve.state=#{state}
                </if>
                <if test="isTimeout != null and isTimeout != ''">
                    and automessage_guide_evolve.is_timeout=#{isTimeout}
                </if>
            </where>
            GROUP BY automessage_guide_evolve.id
            ) as m
    </select>
</mapper>