From 06446753fe25d9f9a459531e1866d955705437d3 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 15 七月 2021 17:40:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index 202bfac..1e42251 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -840,6 +840,15 @@
"<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
" AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
" </if> " +
+ "<if test='screenEventDTO.eventProcessStatus != null'>" +
+ " AND e.event_process_status = #{screenEventDTO.eventProcessStatus} " +
+ " </if> " +
+ "<if test='screenEventDTO.redCard != null'>" +
+ " AND e.red_card = #{screenEventDTO.redCard} " +
+ " </if> " +
+ "<if test='screenEventDTO.yellowCard != null'>" +
+ " AND e.yellow_card = #{screenEventDTO.yellowCard} " +
+ " </if> " +
"UNION ALL SELECT " +
" IFNULL( NULL, 7 ) AS type, " +
" id AS eventId, " +
@@ -854,6 +863,9 @@
"<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>" +
" AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
" </if> " +
+ "<if test='screenEventDTO.eventProcessStatus != null'>" +
+ " AND handle_status = #{screenEventDTO.eventProcessStatus} " +
+ " </if> " +
" </script>")
List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
--
Gitblit v1.7.1