From 39716db4373ffb6e3638a5f0dfec274da8f942d2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 31 Aug 2022 16:47:54 +0800
Subject: [PATCH] 大屏返回加工产品库存数量
---
src/main/java/org/springblade/modules/lang/controller/LandController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/lang/controller/LandController.java b/src/main/java/org/springblade/modules/lang/controller/LandController.java
index c78e810..75c8de4 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -113,7 +113,7 @@
*/
@GetMapping("/selcetByStrainId")
public R selcetByStrainId(String strainId,String farmId) {
- List<Land> list = landService.selectByStrainId(strainId,farmId);
+ List<LandVO> list = landService.selectByStrainId(strainId,farmId);
return R.data(list);
}
@@ -365,7 +365,7 @@
if (unit.equals("0")) {
num += area1;
}
- if (unit.equals("1")) {
+ else if (unit.equals("1")) {
double v = area1 * 0.1;
num += v;
} else {
@@ -385,10 +385,10 @@
if (unit.equals("0")) {
snum += area1;
}
- if (unit.equals("1")) {
+ else if (unit.equals("1")) {
double v = area1 * 0.1;
snum += v;
- } else {
+ } else{
double v = area1 * 0.0015;
snum += v;
}
@@ -440,7 +440,7 @@
if (unit.equals("0")) {
num += area1;
}
- if (unit.equals("1")) {
+ else if (unit.equals("1")) {
double v = area1 * 0.1;
num += v;
} else {
@@ -460,7 +460,7 @@
if (unit.equals("0")) {
snum += area1;
}
- if (unit.equals("1")) {
+ else if (unit.equals("1")) {
double v = area1 * 0.1;
snum += v;
} else {
@@ -480,7 +480,7 @@
if (unit.equals("0")) {
wnum += area1;
}
- if (unit.equals("1")) {
+ else if (unit.equals("1")) {
double v = area1 * 0.1;
wnum += v;
} else {
--
Gitblit v1.9.3