From 55dcf9509c898220cbc1c62339157a7c85856229 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Sat, 12 Oct 2024 14:34:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=9F=E8=AE=A1=E8=BF=916=E4=B8=AA?= =?UTF-8?q?=E6=9C=88=E6=9C=80=E9=AB=98=E5=BE=97=E5=88=86=E5=8D=A0=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/count/TdChecknumController.java | 14 +++++++------- .../system/mapper/check/TdCheckReportMapper.java | 4 ++++ .../system/service/check/TdCheckReportService.java | 3 +++ .../check/impl/TdCheckReportServiceImpl.java | 6 ++++++ .../mapper/system/TdCheckReportMapper.xml | 4 ++++ 5 files changed, 24 insertions(+), 7 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 eeb9bd1..9f83619 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 @@ -14,6 +14,7 @@ import com.ruoyi.system.domain.check.TdCheckReport; import com.ruoyi.system.domain.check.dto.CheckReportDTO; import com.ruoyi.system.domain.count.CheckResultCountDTO; import com.ruoyi.system.domain.count.CheckTypeCountDTO; +import com.ruoyi.system.domain.count.PropertyManagerDTO; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ITdNotifyService; import com.ruoyi.system.service.check.TdCheckReportService; @@ -125,15 +126,14 @@ public class TdChecknumController extends BaseController{ date = Date.from(LocalDate.parse(month.concat(StrPool.DASHED).concat("01")).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant()); Date minDayTime = ObtainLastSixMonthsUtil.getStartOfDay(date); AtomicReference yAxis = new AtomicReference<>(); - TdCheckReport checkReport = new LambdaQueryChainWrapper<>(checkReportService.getBaseMapper()) - .ge(TdCheckReport::getCreateTime, minDayTime) - .le(TdCheckReport::getCreateTime, maxDayTime) - .orderByDesc(TdCheckReport::getPercentageScore) - .last("limit 1").one(); - if(Objects.isNull(checkReport)){ + PropertyManagerDTO tdPropertWx = new PropertyManagerDTO(); + tdPropertWx.setMinDayTime(minDayTime); + tdPropertWx.setMaxDayTime(maxDayTime); + Double maxCount = checkReportService.countSecretsWxMonth(tdPropertWx); + if(Objects.isNull(maxCount)){ yAxis.set(0.0); }else{ - yAxis.set(Double.valueOf(checkReport.getPercentageScore())); + yAxis.set(maxCount); } yAxisData.add(yAxis.get()); }); 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 a8094ca..57067e2 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 @@ -5,6 +5,7 @@ import com.ruoyi.system.domain.check.TdCheckReport; import com.ruoyi.system.domain.check.dto.CheckReportDTO; import com.ruoyi.system.domain.count.CheckResultCountDTO; import com.ruoyi.system.domain.count.CheckTypeCountDTO; +import com.ruoyi.system.domain.count.PropertyManagerDTO; import java.util.List; @@ -26,6 +27,9 @@ public interface TdCheckReportMapper extends BaseMapper { public CheckTypeCountDTO selectTypeCount(); + + public Double countSecretsWxMonth(PropertyManagerDTO propertyManagerDTO); + } 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 0a8f5d7..e7ad021 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 @@ -5,6 +5,7 @@ import com.ruoyi.system.domain.check.TdCheckReport; import com.ruoyi.system.domain.check.dto.CheckReportDTO; import com.ruoyi.system.domain.count.CheckResultCountDTO; import com.ruoyi.system.domain.count.CheckTypeCountDTO; +import com.ruoyi.system.domain.count.PropertyManagerDTO; import com.ruoyi.system.domain.place.TdPlace; import java.util.List; @@ -26,4 +27,6 @@ public interface TdCheckReportService extends IService { public CheckTypeCountDTO selectTypeCount(); + + public Double countSecretsWxMonth(PropertyManagerDTO propertyManagerDTO); } 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 7f137d5..3876841 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 @@ -5,6 +5,7 @@ import com.ruoyi.system.domain.check.TdCheckReport; import com.ruoyi.system.domain.check.dto.CheckReportDTO; import com.ruoyi.system.domain.count.CheckResultCountDTO; import com.ruoyi.system.domain.count.CheckTypeCountDTO; +import com.ruoyi.system.domain.count.PropertyManagerDTO; import com.ruoyi.system.mapper.check.TdCheckReportMapper; import com.ruoyi.system.mapper.place.TdPlaceMapper; import com.ruoyi.system.service.check.TdCheckReportService; @@ -44,6 +45,11 @@ public class TdCheckReportServiceImpl extends ServiceImpl +