fix:统计近6个月最高得分占比

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<Double> yAxis = new AtomicReference<>();
-            TdCheckReport checkReport = new LambdaQueryChainWrapper<>(checkReportService.getBaseMapper())
+            PropertyManagerDTO tdPropertWx = new PropertyManagerDTO();
-                    .ge(TdCheckReport::getCreateTime, minDayTime)
+            tdPropertWx.setMinDayTime(minDayTime);
-                    .le(TdCheckReport::getCreateTime, maxDayTime)
+            tdPropertWx.setMaxDayTime(maxDayTime);
-                    .orderByDesc(TdCheckReport::getPercentageScore)
+            Double maxCount = checkReportService.countSecretsWxMonth(tdPropertWx);
-                    .last("limit 1").one();
+            if(Objects.isNull(maxCount)){
-            if(Objects.isNull(checkReport)){
                 yAxis.set(0.0);
             }else{
-                yAxis.set(Double.valueOf(checkReport.getPercentageScore()));
+                yAxis.set(maxCount);
             }
             yAxisData.add(yAxis.get());
         });

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<TdCheckReport> {
 
     public CheckTypeCountDTO selectTypeCount();
 
+
+    public Double countSecretsWxMonth(PropertyManagerDTO propertyManagerDTO);
+
 }
 
 

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<TdCheckReport> {
 
     public CheckTypeCountDTO selectTypeCount();
 
+
+    public Double countSecretsWxMonth(PropertyManagerDTO propertyManagerDTO);
 }

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<TdCheckReportMapper, T
     public CheckTypeCountDTO selectTypeCount() {
         return checkReportMapper.selectTypeCount();
     }
+
+    @Override
+    public Double countSecretsWxMonth(PropertyManagerDTO propertyManagerDTO) {
+        return checkReportMapper.countSecretsWxMonth(propertyManagerDTO);
+    }
 }
 
 

ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml

@@ -107,5 +107,9 @@
             SUM (CASE WHEN check_state = 3 THEN 1 ELSE 0 END) AS ybc
         from td_check_report
     </select>
+    <select id="countSecretsWxMonth" resultType="java.lang.Double" parameterType="PropertyManagerDTO">
+        SELECT MAX(CAST(percentage_score AS DOUBLE)) as percentageScore from td_check_report  t  where t.create_time &gt;= #{minDayTime}
+                      AND t.create_time &lt;= #{maxDayTime}  limit 1
+    </select>
 
 </mapper>