From 47b87502326a8c6ff173bb699c795c3077662c3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=88=B1=E5=AD=A6=E4=B9=A0=E7=9A=84=E7=9F=B3?=
 =?UTF-8?q?=E5=90=8C=E5=AD=A6?= <2936013465@qq.com>
Date: Sat, 16 Nov 2024 17:44:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E7=9D=A3=E5=AF=9F=E6=83=85?=
 =?UTF-8?q?=E5=86=B52024/11/16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constants/enums/ProblemSourcesEnum.java           |  4 ++++
 .../controller/datav/SupervisionNotifyController.java | 11 ++++++++++-
 .../service/DataSupervisionNotifyServiceImpl.java     |  9 +++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/biutag/supervision/constants/enums/ProblemSourcesEnum.java b/src/main/java/com/biutag/supervision/constants/enums/ProblemSourcesEnum.java
index 4c9a0bc..029e10c 100644
--- a/src/main/java/com/biutag/supervision/constants/enums/ProblemSourcesEnum.java
+++ b/src/main/java/com/biutag/supervision/constants/enums/ProblemSourcesEnum.java
@@ -23,6 +23,10 @@ public enum ProblemSourcesEnum {
     XF_QT("其他", "25"),
 
     SJJD("审计监督", "26"),
+    ZFTZSJ("政府投资审计", "27"),
+    ZFSACFSS("执法涉案财务审计", "28"),
+    JJZRSJ("经济责任审计", "29"),
+    ZXSJ("专项审计", "30"),
 
     JWDC("警务评议", "2"),
     JYDC("警意调查", "3"),
diff --git a/src/main/java/com/biutag/supervision/controller/datav/SupervisionNotifyController.java b/src/main/java/com/biutag/supervision/controller/datav/SupervisionNotifyController.java
index 5eafd2b..1a9ae16 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/SupervisionNotifyController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/SupervisionNotifyController.java
@@ -3,6 +3,7 @@ package com.biutag.supervision.controller.datav;
 import com.alibaba.fastjson.JSONObject;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.dto.CaseVerifDepart;
+import com.biutag.supervision.pojo.vo.EchartsVo;
 import com.biutag.supervision.pojo.vo.RankVo;
 import com.biutag.supervision.service.DataSupervisionNotifyServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;
@@ -33,7 +34,7 @@ public class SupervisionNotifyController {
     private final DataSupervisionNotifyServiceImpl dataSupervisionNotifyService;
 
     /**
-     * 获取现场督察大屏中央总数数量
+     * 获取现场督察大屏数据
      *
      * @return
      */
@@ -43,6 +44,11 @@ public class SupervisionNotifyController {
                                                            @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
         JSONObject overview = dataSupervisionNotifyService.getAllSupervisionNotifyCount(beginTime, endTime);
         JSONObject data = new JSONObject().fluentPut("overview", overview);
+
+        //问题类型占比
+        List<EchartsVo> wtlxList = dataSupervisionNotifyService.getProblemTypeRatio(beginTime, endTime);
+
+        //
         return Result.success(data);
     }
 
@@ -66,5 +72,8 @@ public class SupervisionNotifyController {
     }
 
 
+
+
+
 }
 
diff --git a/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java b/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java
index 0f106bc..3b2d21b 100644
--- a/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java
+++ b/src/main/java/com/biutag/supervision/service/DataSupervisionNotifyServiceImpl.java
@@ -16,6 +16,7 @@ import com.biutag.supervision.pojo.entity.DataSupervisionNotify;
 import com.biutag.supervision.pojo.entity.Negative;
 import com.biutag.supervision.pojo.entity.NegativeBlame;
 import com.biutag.supervision.pojo.entity.SupDepart;
+import com.biutag.supervision.pojo.vo.EchartsVo;
 import com.biutag.supervision.pojo.vo.RankVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -142,6 +143,8 @@ public class DataSupervisionNotifyServiceImpl extends ServiceImpl<DataSupervisio
             rankVoRe.setDenominator(totalPro.toString());
             rankVoRe.setNumerator(changed.toString());
             Double rate = totalPro != 0 ? (changed * 1.0 / totalPro) * 100 : 0;
+            int intRate = (int) Math.ceil(rate);
+            rankVoRe.setRate((double) intRate);
             rankVoRe.setDenominator(totalPro.toString());
             rankVoRe.setNumerator(changed.toString());
             rankVoRe.setRate(rate);
@@ -152,6 +155,12 @@ public class DataSupervisionNotifyServiceImpl extends ServiceImpl<DataSupervisio
         // 排序
         return rankVoRes;
     }
+
+    public List<EchartsVo> getProblemTypeRatio(Date beginTime, Date endTime) {
+        List<EchartsVo> echartsVos = new ArrayList<>();
+
+        return null;
+    }
 }