diff --git a/src/main/java/com/dc/dc_project/mapper/RecordReportMapper.java b/src/main/java/com/dc/dc_project/mapper/RecordReportMapper.java index b0de069..91c89bc 100644 --- a/src/main/java/com/dc/dc_project/mapper/RecordReportMapper.java +++ b/src/main/java/com/dc/dc_project/mapper/RecordReportMapper.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface RecordReportMapper extends BaseMapper { + Long getCountByTime(String startTimeStr, String endTimeStr); } diff --git a/src/main/java/com/dc/dc_project/model/vo/RecordEntrustStatisticsVo.java b/src/main/java/com/dc/dc_project/model/vo/RecordEntrustStatisticsVo.java index 218ade7..443b726 100644 --- a/src/main/java/com/dc/dc_project/model/vo/RecordEntrustStatisticsVo.java +++ b/src/main/java/com/dc/dc_project/model/vo/RecordEntrustStatisticsVo.java @@ -13,10 +13,10 @@ public class RecordEntrustStatisticsVo { /** * 委托总数量 */ - private Integer entrustCount; + private Long entrustCount; /** * 报告数量 */ - private Integer reportCount; + private Long reportCount; } diff --git a/src/main/java/com/dc/dc_project/service/RecordEntrustService.java b/src/main/java/com/dc/dc_project/service/RecordEntrustService.java index e2e9a29..9b17321 100644 --- a/src/main/java/com/dc/dc_project/service/RecordEntrustService.java +++ b/src/main/java/com/dc/dc_project/service/RecordEntrustService.java @@ -3,6 +3,8 @@ package com.dc.dc_project.service; import com.dc.dc_project.model.pojo.RecordEntrust; import com.baomidou.mybatisplus.extension.service.IService; +import java.time.LocalDateTime; + /** * @author ADMIN * @description 针对表【sys_record_entrust(检测委托单)】的数据库操作Service @@ -10,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface RecordEntrustService extends IService { + Long getCountByTime(String startTimeStr, String endTime); } diff --git a/src/main/java/com/dc/dc_project/service/RecordReportService.java b/src/main/java/com/dc/dc_project/service/RecordReportService.java index 0cb8a20..503b0f1 100644 --- a/src/main/java/com/dc/dc_project/service/RecordReportService.java +++ b/src/main/java/com/dc/dc_project/service/RecordReportService.java @@ -10,4 +10,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface RecordReportService extends IService { + Long getCountByTime(String startTimeStr, String endTimeStr); } diff --git a/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java index 8f8d8a7..eb551bf 100644 --- a/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java @@ -23,6 +23,7 @@ public class BigScreenServiceImpl implements BigScreenService { private final StandardService standardService; private final PersonnelService personnelService; private final RecordEntrustService recordEntrustService; + private final RecordReportService recordReportService; @Override public ResponseResult getPigStatistics() { BigScreenStatistics bigScreenStatistics = new BigScreenStatistics(); @@ -50,7 +51,12 @@ public class BigScreenServiceImpl implements BigScreenService { for (int i = 1; i < 13; i++) { RecordEntrustStatisticsVo recordEntrustStatistics = new RecordEntrustStatisticsVo(); recordEntrustStatistics.setMonth(i); - recordEntrustStatistics.setEntrustCount(recordEntrustService.count(new LambdaQueryWrapper<>().between(, startTime, endTime))); + recordEntrustStatistics.setEntrustCount( + recordEntrustService.getCountByTime(startTimeStr, endTimeStr) + ); + recordEntrustStatistics.setReportCount( + recordReportService.getCountByTime(startTimeStr, endTimeStr) + ); } return null; } diff --git a/src/main/java/com/dc/dc_project/service/impl/RecordEntrustServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/RecordEntrustServiceImpl.java index ce1a11b..3b51411 100644 --- a/src/main/java/com/dc/dc_project/service/impl/RecordEntrustServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/RecordEntrustServiceImpl.java @@ -17,6 +17,10 @@ import lombok.extern.slf4j.Slf4j; public class RecordEntrustServiceImpl extends ServiceImpl implements RecordEntrustService{ + @Override + public Long getCountByTime(String startTimeStr, String endTime) { + + } } diff --git a/src/main/java/com/dc/dc_project/service/impl/RecordReportServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/RecordReportServiceImpl.java index a80fdc8..3d343bd 100644 --- a/src/main/java/com/dc/dc_project/service/impl/RecordReportServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/RecordReportServiceImpl.java @@ -17,6 +17,11 @@ import lombok.extern.slf4j.Slf4j; public class RecordReportServiceImpl extends ServiceImpl implements RecordReportService{ + @Override + public Long getCountByTime(String startTimeStr, String endTimeStr) { + + return baseMapper.getCountByTime(startTimeStr, endTimeStr); + } } diff --git a/src/main/resources/mapper/RecordReportMapper.xml b/src/main/resources/mapper/RecordReportMapper.xml index cc06fe8..8607c6f 100644 --- a/src/main/resources/mapper/RecordReportMapper.xml +++ b/src/main/resources/mapper/RecordReportMapper.xml @@ -24,4 +24,7 @@ status,conclusion,file_url,remark,created_at, updated_at +