From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java b/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
index 7f22d14..5ff7167 100644
--- a/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
+++ b/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
@@ -17,27 +17,25 @@
package org.springblade.modules.discuss.controller;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.article.entity.ArticleLikeEntity;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.discuss.entity.PublicDiscussEntity;
+import org.springblade.modules.discuss.service.IPublicDiscussService;
import org.springblade.modules.discuss.vo.PublicDiscussVO;
import org.springblade.modules.discuss.wrapper.PublicDiscussWrapper;
-import org.springblade.modules.discuss.service.IPublicDiscussService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
* 公益报名与议事 控制器
@@ -59,10 +57,12 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入publicDiscuss")
- public R<PublicDiscussVO> detail(PublicDiscussVO publicDiscuss) {
+ public R<PublicDiscussEntity> detail(PublicDiscussVO publicDiscuss) {
+// publicDiscuss.setUserId(AuthUtil.getUserId());
PublicDiscussEntity detail = publicDiscussService.getDetail(publicDiscuss);
- return R.data(PublicDiscussWrapper.build().entityVO(detail));
+ return R.data(detail);
}
+
/**
* 公益报名与议事 分页
*/
@@ -113,10 +113,7 @@
@ApiOperation(value = "新增或修改", notes = "传入publicDiscuss")
public R submit(@Valid @RequestBody PublicDiscussEntity publicDiscuss) {
publicDiscuss.setCreateBy(AuthUtil.getUserId());
- UpdateWrapper<PublicDiscussEntity> objectUpdateWrapper = new UpdateWrapper<>();
- objectUpdateWrapper.eq("article_id", publicDiscuss.getArticleId());
- objectUpdateWrapper.eq("event_type", publicDiscuss.getEventType());
- return R.status(publicDiscussService.saveOrUpdate(publicDiscuss,objectUpdateWrapper));
+ return R.status(publicDiscussService.saveOrUpdate(publicDiscuss));
}
/**
--
Gitblit v1.9.3