From d55aa8ce835cd7150dca26280f15fa0b60f37864 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 14 七月 2021 17:18:57 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 4d51dc6..cdbec76 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
@@ -735,15 +735,20 @@
public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
//boolean canRepublishByUser = eventDO.getEventStatus() == 4 || eventDO.getEventStatus() == 1;
- boolean canRepublishByUser = eventDO.getEventDealStatus() == 7|eventDO.getEventDealStatus() == 5; //已失效状态
+ boolean canRepublishByUser = eventDO.getEventDealStatus() == 6|eventDO.getEventDealStatus() == 5; //已失效状态
if (!canRepublishByUser) {
return R.fail("当前不是撤销/草稿状态");
}
+ if(eventDO.getEventCategory().equals(2L)){//宣传教育
+ eventDO.setEventDealStatus(8);
+ }else{
+ eventDO.setEventProcessStatus(1); //待解决
+ eventDO.setProcessType(1); //网格员处理
+ }
eventDO.setEventStatus(2);//2 发布
- eventDO.setEventProcessStatus(1); //待解决
- eventDO.setProcessType(1); //网格员处理
eventDO.setUpdateBy(commonEventRepublishDTO.getUserId());
+
int updated = this.getBaseMapper().updateById(eventDO);
if (updated != 1) {
return R.fail("更新事件状态失败");
@@ -2260,7 +2265,7 @@
workScreenVO.setResolvedNum(countMap.get("resolvedNum")== null ? 0L : Long.valueOf(countMap.get("resolvedNum").toString()));
workScreenVO.setPendingNum(countMap.get("pendingNum")== null ? 0L : Long.valueOf(countMap.get("pendingNum").toString()));
workScreenVO.setPropagandaNum(countMap.get("propagandaNum")== null ? 13L : Long.valueOf(countMap.get("propagandaNum").toString()));
- workScreenVO.setCurrentNum(countMap.get("currentNum")== null ? 0L : Long.valueOf(countMap.get("currentNum").toString()));
+ workScreenVO.setCurrentNum(countMap.get("sspCurrentNum") + countMap.get("currentNum"));
}
//计算处理时间消耗的时间
--
Gitblit v1.7.1