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 count12(@RequestBody MonthRangeSo monthRangeSo){ + public R> count12(@RequestBody MonthRangeSo monthRangeSo){ List list = mentenceFarmerRecordService.count12(monthRangeSo); - return list; + return R.ok(list); } @Operation(summary = "根据时间统计隐患类型数目") @PostMapping("/countType") - public Map countType(@RequestBody MonthRangeSo monthRangeSo){ + public R> countType(@RequestBody MonthRangeSo monthRangeSo){ Map map = mentenceFarmerRecordService.countType(monthRangeSo); - return map; + return R.ok(map); } @Operation(summary = "统计本年的隐患数") @GetMapping("/countYear/{year}") - public Map countYear(@PathVariable("year") String year){ + public R> countYear(@PathVariable("year") String year){ Map map = mentenceFarmerRecordService.countYear(year); - return map; + return R.ok(map); } @Override public String getGroupId() {