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 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 getProblemTypeRatio(Date beginTime, Date endTime) { + List echartsVos = new ArrayList<>(); + + return null; + } }