Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-31 d3e5446447c79948eee93035900401aff50706fb

 ycl-platform/src/main/resources/mapper/allot/EfficiencyMapper.xml

@@ -41,7 +41,15 @@
        WHERE
            ubc.category = 1
          AND t4.`name` IS NOT NULL
        <if test="beginTime!=null">
            and  ubc.alarm_time BETWEEN #{beginTime} and #{endTime}
        </if>
        GROUP BY
            t4.id,DATE_FORMAT(alarm_time,'%Y-%m')
        ORDER BY DATE_FORMAT(alarm_time,'%Y-%m') desc ,COUNT(1) desc
    </select>
    <select id="getSmokeCustomer" resultType="java.lang.Long">
        select count(1) total from ums_ods_customer
    </select>

</mapper>