From 7e2b1cce36643fe48aec347e8ec1bbf3d25c3d4e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 18:09:45 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml | 8 ++++++++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 2 +-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index aed4c99..cf73689 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -1400,7 +1400,7 @@
Integer eventDealStatus = -1;
//1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销、7已失效
- if(eventDO.getInvalid()==false){
+ if(eventDO.getInvalid()!=null && eventDO.getInvalid()==false){
eventDealStatus = 7;//7已失效
}else if(event_status ==2 && event_process_status == 1 && process_type == 1) {
eventDealStatus = 1;//"待处理"
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
index e579624..4dbb8d9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -429,6 +429,14 @@
<if test="pageEventManageDTO.communityId!=null">
AND egd.grid_community_id = #{pageEventManageDTO.communityId}
</if>
+ <if test='pageEventManageDTO.keyWord != null and pageEventManageDTO.keyWord != ""'>
+ AND (
+ e.grid_member_name like concat('%', #{pageEventManageDTO.keyWord},'%') OR
+ e.event_title like concat('%', #{pageEventManageDTO.keyWord},'%') OR
+ e.happen_address like concat('%', #{pageEventManageDTO.keyWord},'%')
+ e.order_sn like concat('%', #{pageEventManageDTO.keyWord},'%')
+ )
+ </if>
<if test="pageEventManageDTO.eventDealStatus!=null">
AND e.event_deal_status = #{pageEventManageDTO.eventDealStatus}
</if>
--
Gitblit v1.7.1