From 2f432628a460a73f830c278a7d69e8328767a7b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
index ec01e55..027836c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
@@ -3,11 +3,16 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.domain.MeetingStatistic;
import com.ruoyi.service.MeetingStatisticService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@RestController
@RequestMapping("/zMeetingStatistic")
@@ -16,6 +21,30 @@
private MeetingStatisticService meetingStatisticService;
/**
+ * 鍏ㄩ儴鏁版嵁
+ */
+ @GetMapping("/all")
+ public AjaxResult listAll(MeetingStatistic meetingStatistic){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return meetingStatisticService.selectDataList(meetingStatistic, pageNum, pageSize);
+ }
+ /**
+ * 鏍规嵁id,鑾峰彇浼氳璁板綍璇︾粏淇℃伅
+ */
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(meetingStatisticService.getById(id));
+ }
+
+ /**
+ * 鍙緭鍑哄搴彿鍜屽垱寤烘椂闂�
+ */
+ @GetMapping("/one")
+ public AjaxResult listOne(MeetingStatistic meetingStatistic){
+ return meetingStatisticService.DataList(meetingStatistic);
+ }
+ /**
* 淇敼浼氳缁熻
*/
@Log(title = "浼氳缁熻", businessType = BusinessType.UPDATE)
@@ -24,6 +53,7 @@
return meetingStatisticService.updateData(meetingStatistic);
}
+
/**
* 鎵归噺鍒犻櫎浼氳缁熻璁板綍
*/
--
Gitblit v1.9.1