From 46330a1d56dcd3fa3935a2f35da2899a8597ad66 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Jun 2022 15:38:56 +0800
Subject: [PATCH] 农资统计
---
src/main/resources/application-dev.yml | 4 ++--
src/main/java/org/springblade/modules/stock/controller/StockController.java | 10 ++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stock/controller/StockController.java b/src/main/java/org/springblade/modules/stock/controller/StockController.java
index c82f120..5c1c764 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -41,6 +41,7 @@
import org.springblade.modules.stock.service.IStockService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -455,8 +456,13 @@
cknu += cknum;
}
Map map= new HashMap();
- map.put("rknum",rknu);
- map.put("cknum",cknu);
+ DecimalFormat df = new DecimalFormat("#0.00");
+ String format = df.format(rknu);
+ Double a = Double.parseDouble(format);
+ String format1 = df.format(cknu);
+ double b = Double.parseDouble(format1);
+ map.put("rknum",a);
+ map.put("cknum",b);
return R.data(map);
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 8511d7d..631de1d 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -13,9 +13,9 @@
# commandTimeout: 5000
datasource:
# MySql
- url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://localhost:3306/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: root
+ password: 131556
# PostgreSQL
#url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
#username: postgres
--
Gitblit v1.9.3