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 | 16 +++++++++++-----
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html | 5 +++--
2 files changed, 14 insertions(+), 7 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 c46a855..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
@@ -188,9 +188,6 @@
@GetMapping("/system/indexDataCount")
public AjaxResult indexDataCount() {
IndexVo result = new IndexVo();
- result.setProjectStatus0(0);
- result.setProjectStatus0(0);
- result.setProjectStatus0(0);
//=============================鏌ヨ鍦哄湴鏁伴噺===============================
List<Project> projectList = projectService.selectProjectCountByStatus();
if (!ObjectUtils.isEmpty(projectList)) {
@@ -199,13 +196,22 @@
result.setProjectStatus0(item.getStatusNumber());
}
if (RecordType.projectStatus1.getId().equals(item.getStatus())) {
- result.setProjectStatus0(item.getStatusNumber());
+ result.setProjectStatus1(item.getStatusNumber());
}
if (RecordType.projectStatus2.getId().equals(item.getStatus())) {
- result.setProjectStatus0(item.getStatusNumber());
+ result.setProjectStatus2(item.getStatusNumber());
}
}
}
+ if (ObjectUtils.isEmpty(result.getProjectStatus0())) {
+ result.setProjectStatus0(0);
+ }
+ if (ObjectUtils.isEmpty(result.getProjectStatus1())) {
+ result.setProjectStatus1(0);
+ }
+ if (ObjectUtils.isEmpty(result.getProjectStatus2())) {
+ result.setProjectStatus2(0);
+ }
//=============================鏌ヨ杩涘昂===============================
Hole hole = holeService.selectHoleTotalProcess();
result.setFootageCplCount(hole.getFootageCpl());
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
index 1e158f1..0293f9e 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
@@ -90,14 +90,15 @@
},
{
field : 'laborUnit',
- title : '鍔冲姟鍗曚綅'
+ title : '鍔冲姟鍗曚綅',
+ visible: false
},
{
field : 'district',
title : '鍖哄幙',
},
{
- field : 'leaderName',
+ field : 'leader',
title : '鍦哄湴璐熻矗浜�'
},
{
--
Gitblit v1.9.1