From 604ef66c8a7db90250a241a9795c9acb37504099 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 18:18:45 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 cf73689..dac4cc0 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
@@ -1402,17 +1402,19 @@
//1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销、7已失效
if(eventDO.getInvalid()!=null && eventDO.getInvalid()==false){
eventDealStatus = 7;//7已失效
- }else if(event_status ==2 && event_process_status == 1 && process_type == 1) {
+ }else if(event_status!=null && event_status ==2 && event_process_status!=null && event_process_status == 1
+ && process_type!=null && process_type == 1) {
eventDealStatus = 1;//"待处理"
- }else if( event_process_status == 3) {
+ }else if( event_process_status!=null && event_process_status == 3) {
eventDealStatus = 2;//"待验证"
- }else if(event_status == 2 && community_process == 1 && process_type == 2) {
+ }else if(event_status!=null && event_status == 2 && community_process!=null
+ && community_process == 1 && process_type!=null && process_type == 2) {
eventDealStatus=3;//"已上报"
- }else if( event_process_status == 2 ) {
+ }else if( event_process_status!=null && event_process_status == 2 ) {
eventDealStatus=4;//"已解决"
- }else if( event_status == 1 ) {
+ }else if( event_status!=null && event_status == 1 ) {
eventDealStatus = 5;//"草稿箱"
- }else if( event_status == 4 ) {
+ }else if( event_status!=null && event_status == 4 ) {
eventDealStatus=6;//"已撤销"
}
return eventDealStatus;
--
Gitblit v1.7.1