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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdChecknumController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.system.count;
 
 import cn.hutool.core.text.StrPool;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -18,6 +19,8 @@ import com.ruoyi.system.service.ITdNotifyService;
 import com.ruoyi.system.service.check.TdCheckReportService;
 import com.ruoyi.web.controller.manager.CheckReportManager;
 import io.swagger.annotations.ApiOperation;
+import lombok.val;
+import org.apache.catalina.User;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -75,7 +78,7 @@ public class TdChecknumController extends BaseController{
     @PostMapping("/countCheckMonth")
     @ResponseBody
     public AjaxResult countCheckMonth() {
-        List<String> recentlySixMonth = ObtainLastSixMonthsUtil.getRecentlyTwelveMonth();
+        List<String> recentlySixMonth = ObtainLastSixMonthsUtil.getRecentlySixMonth();
         List<Long> yAxisData = new ArrayList<>();
         recentlySixMonth.forEach(month -> {
             // 获取指定月份的最大日期
@@ -102,6 +105,44 @@ public class TdChecknumController extends BaseController{
         return AjaxResult.success(obj);
     }
 
+    /**
+     *
+     *统计近6个月最高得分占比
+     * @return
+     */
+    @PostMapping("/countCheckScoresMonth")
+    @ResponseBody
+    public AjaxResult countCheckScoresMonth() {
+        List<String> recentlySixMonth = ObtainLastSixMonthsUtil.getRecentlySixMonth();
+        List<Double> yAxisData = new ArrayList<>();
+        recentlySixMonth.forEach(month -> {
+            // 获取指定月份的最大日期
+            String lastDayOfMonth = ObtainLastSixMonthsUtil.getLastDayOfMonth(month);
+            // 获取指定天的最大时间
+            Date date = Date.from(LocalDate.parse(lastDayOfMonth).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
+            Date maxDayTime = ObtainLastSixMonthsUtil.getEndOfDay(date);
+            // 获取最小时间
+            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())
+                    .ge(TdCheckReport::getCreateTime, minDayTime)
+                    .le(TdCheckReport::getCreateTime, maxDayTime)
+                    .orderByDesc(TdCheckReport::getPercentageScore)
+                    .last("limit 1").one();
+            if(Objects.isNull(checkReport)){
+                yAxis.set(0.0);
+            }else{
+                yAxis.set(Double.valueOf(checkReport.getPercentageScore()));
+            }
+            yAxisData.add(yAxis.get());
+        });
+        JSONObject obj = new JSONObject();
+        obj.put("xAxisData", recentlySixMonth.toArray());
+        obj.put("yAxisData", yAxisData);
+        return AjaxResult.success(obj);
+    }
+
 
 
 

ruoyi-admin/src/main/resources/templates/system/check/checknum/checknum.html

@@ -45,7 +45,10 @@
         <div class="count_top">
             <div class="echart">
                 <div class="children_echarts right_echarts">
-                    <div id="rightMain" style="width: 1300px;height:380px"></div>
+                    <div id="rightMain" style="width: 650px;height:380px"></div>
+                </div>
+                <div class="children_echarts right_echarts">
+                    <div id="leftMain" style="width: 650px;height:380px"></div>
                 </div>
             </div>
         </div>
@@ -184,6 +187,43 @@
             });
         }
     })
+
+
+    var leftMain = echarts.init(document.getElementById('leftMain'));
+    axios.post(prefix + '/countCheckScoresMonth').then(response => {
+        if (response.data.code == web_status.SUCCESS){
+            leftMain.setOption({
+                title: {
+                    text: '最高得分占比统计'
+                },
+                tooltip: {},
+                legend: {
+                    data:['得分占比']
+                },
+                xAxis: {
+                    data: response.data.data.xAxisData,
+                    /*axisLabel: {
+                        rotate: 45, // 旋转标签的角度
+                        margin: 10, // 标签与坐标轴的间距
+                    },*/
+                },
+                yAxis: {
+
+                },
+                series: [
+                    {
+                        name: '得分占比',
+                        type: 'bar',
+                        data: response.data.data.yAxisData,
+                        itemStyle: {
+                            color: '#546dc6'
+                        }
+                    }
+                ],
+            });
+        }
+    })
+
     var prefixTable = ctx + "system/checkReport";
     let datas = []
     $.ajax({