From 2ed25aaea1ecf04f256c48a68fa2bd800c88c8a6 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Mon, 8 Sep 2025 10:57:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=85=BB=E6=8A=A4-=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hsz/controller/MentenceInfoCountController.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gunshi/project/hsz/controller/MentenceInfoCountController.java b/src/main/java/com/gunshi/project/hsz/controller/MentenceInfoCountController.java
index 45c3e0e..cff5f56 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/MentenceInfoCountController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/MentenceInfoCountController.java
@@ -2,7 +2,6 @@ package com.gunshi.project.hsz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
-import com.gunshi.db.dto.DateTimeRangeSo;
 import com.gunshi.db.dto.MonthRangeSo;
 import com.gunshi.project.hsz.entity.so.MentenceFarmerRecordPageSo;
 import com.gunshi.project.hsz.entity.vo.MentenceInfoCount12Vo;
@@ -44,23 +43,23 @@ public class MentenceInfoCountController extends AbstractCommonFileController {
 
     @Operation(summary = "根据时间统计隐患数目")
     @PostMapping("/count12")
-    public List<MentenceInfoCount12Vo> count12(@RequestBody MonthRangeSo monthRangeSo){
+    public R<List<MentenceInfoCount12Vo>> count12(@RequestBody MonthRangeSo monthRangeSo){
      List<MentenceInfoCount12Vo> list = mentenceFarmerRecordService.count12(monthRangeSo);
-     return list;
+     return R.ok(list);
     }
 
     @Operation(summary = "根据时间统计隐患类型数目")
     @PostMapping("/countType")
-    public Map<Integer,Integer> countType(@RequestBody MonthRangeSo monthRangeSo){
+    public R<Map<Integer,Integer>> countType(@RequestBody MonthRangeSo monthRangeSo){
         Map<Integer,Integer> map = mentenceFarmerRecordService.countType(monthRangeSo);
-        return map;
+        return R.ok(map);
     }
 
     @Operation(summary = "统计本年的隐患数")
     @GetMapping("/countYear/{year}")
-    public Map<Integer,Integer> countYear(@PathVariable("year") String year){
+    public R<Map<Integer,Integer>> countYear(@PathVariable("year") String year){
         Map<Integer,Integer> map = mentenceFarmerRecordService.countYear(year);
-        return map;
+        return R.ok(map);
     }
     @Override
     public String getGroupId() {