From 83869063b8b493c361f9006f2c93963776004e15 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 22 五月 2024 18:16:00 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 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 65725e7..ff59cd9 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
@@ -164,13 +164,29 @@
String ids = projects.get(i).getIds();
Double val = holeMap.get(ids);
vo = new ProjectProcessVO();
+
+ vo.setIds(projects.get(i).getIds());
vo.setRanking(i + 1);
- vo.setStation(projects.get(i).getCode());
+ vo.setStation(projects.get(i).getFullName());
vo.setValue(val);
+ vo.setLng(projects.get(i).getLng());
+ vo.setLat(projects.get(i).getLat());
+
+
if (val == null) {
vo.setValue(0.0d);
}
- vo.setStatus(projects.get(i).getStatus());
+ String []statusName ={"鍗忚皟涓�","寰呭紑宸�","杩涜涓�"};
+ String status = projects.get(i).getStatus();
+ if(status.equals("0")){
+ vo.setStatus(statusName[0]);
+ }else if(status.equals("1")){
+ vo.setStatus(statusName[1]);
+ }else if(status.equals("2")){
+ vo.setStatus(statusName[2]);
+ }else{
+ vo.setStatus("鏈煡");
+ }
vos.add(vo);
}
}
@@ -185,10 +201,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)) {
@@ -197,23 +212,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.setProjectStatus0(0);
+ result.setProjectStatus1(0);
}
if (ObjectUtils.isEmpty(result.getProjectStatus2())) {
- result.setProjectStatus0(0);
+ result.setProjectStatus2(0);
}
- if (ObjectUtils.isEmpty(result.getProjectStatus2())) {
- result.setProjectStatus0(0);
- }
-
//=============================鏌ヨ杩涘昂===============================
Hole hole = holeService.selectHoleTotalProcess();
result.setFootageCplCount(hole.getFootageCpl());
--
Gitblit v1.9.1