From 280001d476b92bf2d14052518e6f69bee9dee43d Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期四, 18 七月 2024 16:13:15 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 8555a5f..be620f2 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
@@ -142,6 +142,8 @@
public String main(ModelMap mmap) {
mmap.put("version", Global.getVersion());
+ String loginname = ShiroUtils.getLoginName();
+ mmap.put("loginuser",loginname);
return "main";
}
@@ -164,7 +166,7 @@
public AjaxResult totalProcess() {
AjaxResult ajaxResult = AjaxResult.success();
Hole hole = holeService.selectHoleTotalProcess();
- Double data = Arith.div(hole.getFootageCpl(), hole.getFootage(), 2);
+ Double data = Arith.div(hole.getFootageCpl(), hole.getFootage(), 4);
ajaxResult.put("pointerData", data);
return ajaxResult;
}
@@ -384,7 +386,7 @@
@ResponseBody
@GetMapping("/system/stat/sumHoleLog")
public AjaxResult sumHoleLog() {
- AjaxResult ajaxResult = new AjaxResult();
+ AjaxResult ajaxResult = AjaxResult.success();
List<DrillDateVo> drillDateList = holeLogService.SUMHoleLog();
ajaxResult.put("drillDateList",drillDateList);
return ajaxResult;
--
Gitblit v1.9.1