diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java index 5cd231e..cf3244c 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java @@ -37,7 +37,6 @@ public class DataGobalController { /** * 获取数据大屏总数概览 - * * @param beginTime * @param endTime * @return diff --git a/src/main/java/com/biutag/supervision/service/DataGobalService.java b/src/main/java/com/biutag/supervision/service/DataGobalService.java index df9df44..740b102 100644 --- a/src/main/java/com/biutag/supervision/service/DataGobalService.java +++ b/src/main/java/com/biutag/supervision/service/DataGobalService.java @@ -65,8 +65,10 @@ public class DataGobalService { Integer.parseInt(InspectCaseEnum.TRUE.getValue()), beginTime, endTime, 26); + Long totalPro = caseVerificationPro + supervisionPro + complaintPro + reviewPro + auditPro; JSONObject overview = new JSONObject(); - overview.fluentPut("caseVerificationPro", caseVerificationPro) + overview.fluentPut("totalPro", totalPro) + .fluentPut("caseVerificationPro", caseVerificationPro) .fluentPut("supervisionPro", supervisionPro) .fluentPut("complaintPro", complaintPro) .fluentPut("reviewPro", reviewPro)