From 1a6efcb1ce6bdfa1bc76fc4b7e9420ee35c1c531 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Thu, 15 Aug 2024 15:52:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A3=80=E6=9F=A5=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/count/TdChecknumController.java | 10 ++++++---- .../mapper/check/TdCheckReportMapper.java | 6 ++++++ .../service/check/TdCheckReportService.java | 7 +++++++ .../check/impl/TdCheckReportServiceImpl.java | 12 ++++++++++++ .../mapper/system/TdCheckReportMapper.xml | 17 +++++++++++++++++ 5 files changed, 48 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdChecknumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdChecknumController.java index 9238dc4..b6a717a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdChecknumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdChecknumController.java @@ -12,6 +12,7 @@ import com.ruoyi.system.domain.count.PropertyDesCountDTO; import com.ruoyi.system.domain.count.PropertyStateCountDTO; import com.ruoyi.system.service.ITdCheckService; import com.ruoyi.system.service.ITdNotifyService; +import com.ruoyi.system.service.check.TdCheckReportService; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -35,8 +37,8 @@ import java.util.stream.Collectors; public class TdChecknumController extends BaseController{ private String prefix = "system/check/checknum"; - @Autowired - private ITdCheckService tdCheckService; + @Resource + private TdCheckReportService checkReportService; @Autowired private ITdNotifyService tdNotifyService; @@ -66,7 +68,7 @@ public class TdChecknumController extends BaseController{ @PostMapping("/countResult") @ResponseBody public AjaxResult countbf() { - CheckResultCountDTO checkResultCountDTO = tdCheckService.selectResultCount(); + CheckResultCountDTO checkResultCountDTO = checkReportService.selectResultCount(); List datas = checkResult.stream() .map(name -> { AtomicReference value = new AtomicReference<>(0L); @@ -93,7 +95,7 @@ public class TdChecknumController extends BaseController{ @PostMapping("/countType") @ResponseBody public AjaxResult countXH() { - CheckTypeCountDTO checkTypeCountDTO = tdCheckService.selectTypeCount(); + CheckTypeCountDTO checkTypeCountDTO = checkReportService.selectTypeCount(); List datas = checkType.stream() .map(name -> { AtomicReference value = new AtomicReference<>(0L); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/check/TdCheckReportMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/check/TdCheckReportMapper.java index f1bc1c6..fd24b15 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/check/TdCheckReportMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/check/TdCheckReportMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper.check; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.check.TdCheckReport; +import com.ruoyi.system.domain.count.CheckResultCountDTO; +import com.ruoyi.system.domain.count.CheckTypeCountDTO; import java.util.List; @@ -16,6 +18,10 @@ public interface TdCheckReportMapper extends BaseMapper { public List selectTdCheckReportList(TdCheckReport tdCheckReport); + public CheckResultCountDTO selectResultCount(); + + public CheckTypeCountDTO selectTypeCount(); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/check/TdCheckReportService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/check/TdCheckReportService.java index df27a2a..51deb2e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/check/TdCheckReportService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/check/TdCheckReportService.java @@ -2,6 +2,8 @@ package com.ruoyi.system.service.check; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.domain.check.TdCheckReport; +import com.ruoyi.system.domain.count.CheckResultCountDTO; +import com.ruoyi.system.domain.count.CheckTypeCountDTO; import com.ruoyi.system.domain.place.TdPlace; import java.util.List; @@ -16,4 +18,9 @@ public interface TdCheckReportService extends IService { public List selectTdCheckReportList(TdCheckReport tdCheckReport); + + public CheckResultCountDTO selectResultCount(); + + public CheckTypeCountDTO selectTypeCount(); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/check/impl/TdCheckReportServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/check/impl/TdCheckReportServiceImpl.java index 4c76e17..db05a79 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/check/impl/TdCheckReportServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/check/impl/TdCheckReportServiceImpl.java @@ -2,6 +2,8 @@ package com.ruoyi.system.service.check.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.domain.check.TdCheckReport; +import com.ruoyi.system.domain.count.CheckResultCountDTO; +import com.ruoyi.system.domain.count.CheckTypeCountDTO; import com.ruoyi.system.mapper.check.TdCheckReportMapper; import com.ruoyi.system.mapper.place.TdPlaceMapper; import com.ruoyi.system.service.check.TdCheckReportService; @@ -26,6 +28,16 @@ public class TdCheckReportServiceImpl extends ServiceImpl selectTdCheckReportList(TdCheckReport tdCheckReport) { return checkReportMapper.selectTdCheckReportList(tdCheckReport); } + + @Override + public CheckResultCountDTO selectResultCount() { + return checkReportMapper.selectResultCount(); + } + + @Override + public CheckTypeCountDTO selectTypeCount() { + return checkReportMapper.selectTypeCount(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml index bc967b5..07de971 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml @@ -42,4 +42,21 @@ ORDER BY create_time DESC + + + + + +