baizonghao
2023-02-24 801b7d11f1ce9b49f35af7eec572143662c4daf4
统计报警时间,查询空指针
2个文件已修改
14 ■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/unlawful/UnlawfulMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/intelligentPatrol/StatisticsController.java
@@ -66,7 +66,7 @@
            startTime = beginTime.format(fmt);
        }
        if (endTime != null){
            endTime1 = beginTime.format(fmt);
            endTime1 = endTime.format(fmt);
        }
        IPage<UnlawfulDto> page = new Page<>();
@@ -91,7 +91,7 @@
            startTime = beginTime.format(fmt);
        }
        if (endTime != null){
            endTime1 = beginTime.format(fmt);
            endTime1 = endTime.format(fmt);
        }
        IPage<UnlawfulDto> page = new Page<>();
        List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulBySite((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
@@ -115,7 +115,7 @@
            startTime = beginTime.format(fmt);
        }
        if (endTime != null){
            endTime1 = beginTime.format(fmt);
            endTime1 = endTime.format(fmt);
        }
        IPage<UnlawfulDto> page = new Page<>();
        List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByTime((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
@@ -138,7 +138,7 @@
            startTime = beginTime.format(fmt);
        }
        if (endTime != null){
            endTime1 = beginTime.format(fmt);
            endTime1 = endTime.format(fmt);
        }
        IPage<UnlawfulDto> page = new Page<>();
        List<UnlawfulDto> unlawfulByType = unlawfulService.getUnlawfulByStreet((currentPage - 1) * pageSize, pageSize, startTime, endTime1);
ycl-platform/src/main/resources/mapper/unlawful/UnlawfulMapper.xml
@@ -264,7 +264,7 @@
<!--    分页数量-->
    <select id="getTotalByType" resultType="java.lang.Integer">
        select
            SUM(num)
            SUM( CASE WHEN num is null THEN 0 ELSE num END )
        from(
                SELECT
                count(*) num
@@ -286,7 +286,7 @@
    </select>
    <select id="getTotalByStreet" resultType="java.lang.Integer">
        select
            SUM(num)
            SUM( CASE WHEN num is null THEN 1 ELSE num END )
        from(
                SELECT
                count(*) num
@@ -330,7 +330,7 @@
    </select>
    <select id="getTotalByTime" resultType="java.lang.Integer">
        select
            SUM(num)
            SUM( CASE WHEN num is null THEN 1 ELSE num END )
        from(
                SELECT
                count(*) num