Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

 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());
    }
}