From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/staff/controller/AnalyticsController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java b/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
index 2522550..3a23ce7 100644
--- a/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
+++ b/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
@@ -1,6 +1,7 @@
package com.ruoyi.staff.controller;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.service.AnalyticsService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -10,23 +11,23 @@
@RestController
@RequestMapping("/staff/analytics")
-public class AnalyticsController {
+public class AnalyticsController extends BaseController {
@Resource
private AnalyticsService analyticsService;
@GetMapping("/reason")
- public AjaxResult staffLeaveReasonAnalytics() {
- return AjaxResult.success(analyticsService.staffLeaveReasonAnalytics());
+ public R<?> staffLeaveReasonAnalytics() {
+ return R.ok(analyticsService.staffLeaveReasonAnalytics());
}
@GetMapping("/monthly_turnover_rate")
- public AjaxResult getMonthlyTurnoverRateFor12Months() {
- return AjaxResult.success(analyticsService.getMonthlyTurnoverRateFor12Months());
+ public R<?> getMonthlyTurnoverRateFor12Months() {
+ return R.ok(analyticsService.getMonthlyTurnoverRateFor12Months());
}
@GetMapping("/total_statistic")
- public AjaxResult getTotalStatistic() {
- return AjaxResult.success(analyticsService.getTotalStatistic());
+ public R<?> getTotalStatistic() {
+ return R.ok(analyticsService.getTotalStatistic());
}
}
--
Gitblit v1.9.3