From 24f2e1047e0260915ce6e401ec36763974531eed Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 27 Jun 2024 10:15:23 +0800
Subject: [PATCH] 积木报表+业主大会统计
---
src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 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 5ff7167..fdd353a 100644
--- a/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
+++ b/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
@@ -16,7 +16,6 @@
*/
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;
@@ -29,6 +28,7 @@
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.discuss.dto.TopicsDTO;
import org.springblade.modules.discuss.entity.PublicDiscussEntity;
import org.springblade.modules.discuss.service.IPublicDiscussService;
import org.springblade.modules.discuss.vo.PublicDiscussVO;
@@ -36,6 +36,8 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
/**
* 公益报名与议事 控制器
@@ -127,4 +129,46 @@
}
+ /**
+ * 议事统计
+ * @param publicDiscuss
+ * @return
+ */
+ @GetMapping("/publicDiscussTotal")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "房屋统计", notes = "传入ids")
+ public R publicDiscussTotal(PublicDiscussVO publicDiscuss) {
+ Map<String, Object> result = publicDiscussService.GetPublicDiscussTotal(publicDiscuss);
+ return R.data(result);
+ }
+
+ /**
+ * 议事统计
+ * @param publicDiscuss
+ * @return
+ */
+ @GetMapping("/managementProtocol")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "管理规约", notes = "传入ids")
+ public R managementProtocol(PublicDiscussVO publicDiscuss) {
+ List<TopicsDTO> result = publicDiscussService.managementProtocol(publicDiscuss,1);
+ return R.data(result);
+
+ }
+
+ /**
+ * 议事统计
+ * @param publicDiscuss
+ * @return
+ */
+ @GetMapping("/candidate")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "candidate", notes = "传入ids")
+ public R candidate(PublicDiscussVO publicDiscuss) {
+ List<TopicsDTO> result = publicDiscussService.managementProtocol(publicDiscuss,2);
+ return R.data(result);
+
+ }
+
+
}
--
Gitblit v1.9.3