101captain
2022-06-06 b5514fa91515a231896d1eee4abad382847278db
bug修改
2个文件已修改
8 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
@@ -257,14 +257,14 @@
                for(String areaValue:area){
                    ComActAcidChartsVO acid=new ComActAcidChartsVO();
                    acid.setName(areaValue);
                    ComActAcidChartsVO acidCount =this.baseMapper.selectAcidCount(date,localCity);
                    ComActAcidChartsVO acidCount =this.baseMapper.selectAcidCount(date,areaValue);
                    if(acidCount!=null){
                        acid.setNumOne(acidCount.getNumOne());
                    }
                    acidList.add(acid);
                    ComActAcidChartsVO danger=new ComActAcidChartsVO();
                    danger.setName(areaValue);
                    ComActAcidChartsVO dangerCount =this.baseMapper.selectDangerCount(date,localCity);
                    ComActAcidChartsVO dangerCount =this.baseMapper.selectDangerCount(date,areaValue);
                    if(dangerCount!=null){
                        danger.setNumOne(dangerCount.getNumOne());
                        danger.setNumTwo(dangerCount.getNumTwo());
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
@@ -296,13 +296,13 @@
            and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')
        </if>
        <if test="localCity!=null and localCity!='' and localCity !='panzhihua'">and relation_name like
            concat('%',#{localCity},'%')</if>) numberOne,
            concat('%',#{localCity},'%')</if>) numOne,
        (select count(*) as numTwo from com_act_acid_danger_member where type = 2
        <if test="date!=null and date!=''">and
            create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')
        </if>
        <if test="localCity!=null and localCity!='' and localCity !='panzhihua'">and relation_name like
            concat('%',#{localCity},'%')</if>) numberTwo
            concat('%',#{localCity},'%')</if>) numTwo
    </select>
    <select id="selectCheck" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidChartsVO">