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/recovery/controller/RecoveryController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
index c8dd772..4c0fcb5 100644
--- a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
+++ b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
@@ -30,6 +30,7 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
/**
* 农事记录控制器
@@ -105,7 +106,7 @@
record.setLandId(recovery.getLandId());
record.setDeptId(recovery.getDeptId());
record.setTenantId(recovery.getTenantId());
- record.setStrainId(recovery.getStrainId());
+ record.setStrainId(Integer.parseInt(recovery.getStrainId()));
record.setOperator(recovery.getOperator());
Strain strain = strainService.getById(recovery.getStrainId());
record.setContent("品种: " + strain.getStrainName() + ", 重量：" + recovery.getWeight());
@@ -115,7 +116,7 @@
//库存
//先查询是否有该农产品的库存(根据地块，农产品)
FarmProductStock stock = new FarmProductStock();
- stock.setStrainId(recovery.getStrainId());
+ stock.setStrainId(Integer.parseInt(recovery.getStrainId()));
stock.setLandId(recovery.getLandId());
FarmProductStock stock1 = farmProductStockService.getOne(new QueryWrapper<>(stock));
if (null != stock1) {
@@ -139,7 +140,7 @@
productStock.setLeaves(recovery.getLeaves());
productStock.setOperator(recovery.getOperator());
productStock.setTime(recovery.getTime());
- productStock.setStrainId(recovery.getStrainId());
+ productStock.setStrainId(Integer.parseInt(recovery.getStrainId()));
productStock.setWeight(recovery.getWeight());
productStock.setRecovery(recovery.getWeight());
productStock.setFarmPlantId(recovery.getFarmPlantId());
@@ -210,6 +211,15 @@
}
/**
+ * xcx数据统计采收详情
+ */
+ @GetMapping("/recoveryStatisticsx")
+ public R recoveryStatisticsx( RecoveryVO recoveryVO, Query query){
+ IPage<RecoveryVO> pages = recoveryService.recoveryStatisticsx(Condition.getPage(query), recoveryVO);
+ return R.data(pages);
+ }
+
+ /**
* 小程序采收详情列表自定义分页
*/
@GetMapping("/pagec")
--
Gitblit v1.9.3