From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改
---
src/main/java/org/springblade/modules/lang/controller/LandController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 deef58d..91de7cf 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);
}
@@ -165,7 +165,9 @@
} else {
v1 = (double) Math.round(area * 100) / 100;
}
+ String myArea = land.getLandArea();
land.setLandArea(String.valueOf(v1));
+ land.setLandArea(myArea);
} else {
land.setLandArea("0");
}
@@ -181,6 +183,8 @@
e.printStackTrace();
}
}
+
+
land.setType(1);
return R.status(landService.saveLandInfo(land));
@@ -293,7 +297,15 @@
e.printStackTrace();
}
}
- land.setLandArea(String.valueOf(v1));
+
+ Land myLand = landService.getById(land.getId());
+ if (myLand.getLandArea().equals(land.getLandArea())){
+ land.setLandArea(String.valueOf(v1));
+ }else {
+ land.setLandArea(land.getLandArea());
+ }
+
+
return R.status(landService.updateLandById(land));
}
@@ -332,6 +344,11 @@
return R.data(landService.selectLandList(userid));
}
+ /**
+ * 获取采收地块列表
+ */
+ @GetMapping("/selectRecoveryLandList")
+ public R selectRecoveryLandList(String farmId){return R.data(landService.selectRecoveryLandList(farmId));}
/**
* 地块列表(不分页)
@@ -365,7 +382,7 @@
if (unit.equals("0")) {
num += area1;
}
- if (unit.equals("1")) {
+ else if (unit.equals("1")) {
double v = area1 * 0.1;
num += v;
} else {
@@ -440,7 +457,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 +477,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 +497,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