From eab652f2f1c596c839013172a472bf88466f0c83 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 17 Sep 2022 14:43:14 +0800
Subject: [PATCH] 数据统计产量统计修正
---
src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 6938bcc..4c0fcb5 100644
--- a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
+++ b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
@@ -21,6 +21,7 @@
import org.springblade.modules.recovery.entity.Recovery;
import org.springblade.modules.recovery.service.RecoveryService;
import org.springblade.modules.recovery.vo.RecoveryVO;
+import org.springblade.modules.stock.vo.StocksVO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -29,6 +30,7 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
/**
* 农事记录控制器
@@ -104,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());
@@ -112,10 +114,10 @@
farmingRecordService.save(record);
//库存
- //先查询是否有该农产品的库存
+ //先查询是否有该农产品的库存(根据地块，农产品)
FarmProductStock stock = new FarmProductStock();
-// stock.setFarmPlantId(recovery.getFarmPlantId());
- stock.setStrainId(recovery.getStrainId());
+ stock.setStrainId(Integer.parseInt(recovery.getStrainId()));
+ stock.setLandId(recovery.getLandId());
FarmProductStock stock1 = farmProductStockService.getOne(new QueryWrapper<>(stock));
if (null != stock1) {
//更新库存
@@ -138,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());
@@ -199,6 +201,23 @@
return R.status(recoveryService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 数据统计采收详情
+ */
+ @PostMapping("/recoveryStatistics")
+ public R<IPage<RecoveryVO>> recoveryStatistics(RecoveryVO recoveryVO, Query query){
+ IPage<RecoveryVO> pages = recoveryService.recoveryStatistics(Condition.getPage(query), recoveryVO);
+ return R.data(pages);
+ }
+
+ /**
+ * xcx数据统计采收详情
+ */
+ @GetMapping("/recoveryStatisticsx")
+ public R recoveryStatisticsx( RecoveryVO recoveryVO, Query query){
+ IPage<RecoveryVO> pages = recoveryService.recoveryStatisticsx(Condition.getPage(query), recoveryVO);
+ return R.data(pages);
+ }
/**
* 小程序采收详情列表自定义分页
--
Gitblit v1.9.3