From dc288bf6ab1201894c6668fc5899dffb53eb7e49 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 10:59:53 +0800
Subject: [PATCH] Merge branch 'local_20221115' into local_20221104
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java
index 0973e51..67cc2e9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java
@@ -1,7 +1,6 @@
package com.panzhihua.applets.api;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.enums.SanShuoEventStatusEnum;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.*;
import com.panzhihua.common.service.community.CommunitySanShuoService;
@@ -12,6 +11,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -19,6 +19,8 @@
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.HashMap;
+
+import static java.util.Objects.nonNull;
/**
* ClassName ComEventController
@@ -84,7 +86,13 @@
@ApiOperation(value = "三说会堂事件表分页列表数据", notes = "三说会堂事件表分页列表数据")
@PostMapping("/page")
public R page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) {
- ComEventVO comEventVO = CopyUtil.copyProperties(comEventPageRequestVO, ComEventVO.class);
+ log.info("================appId="+comEventPageRequestVO);
+ ComEventVO comEventVO = new ComEventVO();
+ BeanUtils.copyProperties(comEventPageRequestVO,comEventVO);
+ comEventPageRequestVO.setCreateBy(getUserId());
+ if (nonNull(comEventPageRequestVO.getAppId())){
+ comEventVO.setAppId(comEventPageRequestVO.getAppId());
+ }
return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize());
}
@@ -114,6 +122,24 @@
* @author manailin
* @date 2022-09-07 11:23:51
*/
+ @ApiOperation("专家受理")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "事件ID", required = true, dataType = "Long"),
+ @ApiImplicitParam(name = "specterId", value = "专家ID", required = true, dataType = "Long"),
+ })
+ @PutMapping("/accept/Request")
+ public R acceptRequest( Long id, Long specterId) {
+ return comEventService.acceptRequest(id, specterId);
+ }
+
+ /**
+ * description 修改三说会堂事件表状态
+ *
+ * @param id 主键id
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
@ApiOperation("专家不受理，转其他专家处理")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long"),
--
Gitblit v1.7.1