From 8009e63d71d0cce17c64c70852119ac4a9d71c4d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 18 十月 2022 14:16:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
index 2b74587..e34cf9c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -28,6 +28,8 @@
import java.util.HashMap;
import java.util.List;
+import static java.util.Objects.isNull;
+
/**
* ClassName ComEventController
* Description 三说会堂事件表控制层
@@ -248,8 +250,9 @@
public R rejectRequest(@RequestParam("id") Long id) {
ComEvent comEvent = comEventService.getById(id);
comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
- comEvent.setSpecialistName(null);
+ comEvent.setSpecialistName("待分配");
comEvent.setSpecialistId(null);
+ comEventService.updateEventStransferRecord(id);
return R.ok(comEventService.updateById(comEvent));
}
@@ -313,7 +316,8 @@
@ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
@GetMapping("/status/calculate")
public R calculate() {
- return comEventService.calculate();
+ comEventService.calculate(getLoginUserInfo());
+ return R.ok();
}
/**
--
Gitblit v1.7.1