From 464634d38dc3579213b828264ef1af8f6e5fa3e1 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 22 五月 2024 16:07:50 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
index f19551e..a4207da 100644
--- a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
+++ b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
@@ -185,10 +185,9 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/indexVo")
- public AjaxResult projectProcess2() {
+ @GetMapping("/system/indexDataCount")
+ public AjaxResult indexDataCount() {
IndexVo result = new IndexVo();
-
//=============================鏌ヨ鍦哄湴鏁伴噺===============================
List<Project> projectList = projectService.selectProjectCountByStatus();
if (!ObjectUtils.isEmpty(projectList)) {
@@ -204,16 +203,15 @@
}
}
}
- if (ObjectUtils.isEmpty(result.getProjectStatus1())) {
+ if (ObjectUtils.isEmpty(result.getProjectStatus0())) {
result.setProjectStatus0(0);
}
- if (ObjectUtils.isEmpty(result.getProjectStatus2())) {
+ if (ObjectUtils.isEmpty(result.getProjectStatus1())) {
result.setProjectStatus1(0);
}
if (ObjectUtils.isEmpty(result.getProjectStatus2())) {
result.setProjectStatus2(0);
}
-
//=============================鏌ヨ杩涘昂===============================
Hole hole = holeService.selectHoleTotalProcess();
result.setFootageCplCount(hole.getFootageCpl());
--
Gitblit v1.9.1