From 4d48da87faccd9c11fe644e92edd54ca0e167b69 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 09 Jul 2022 09:47:40 +0800
Subject: [PATCH] 农场，地块列表查询新增，不分页
---
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
index 5816a2b..41c7ac5 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -16,12 +16,14 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
-import java.util.Date;
+import java.text.DecimalFormat;
+import java.util.*;
/**
* 农产品库存控制器
- * @since 2022-05-18
+ *
* @author zhongrj
+ * @since 2022-05-18
*/
@RestController
@AllArgsConstructor
@@ -65,6 +67,7 @@
/**
* 统计产量
+ *
* @param farmProductStock
* @return
*/
@@ -120,8 +123,66 @@
* 大屏产量统计
*/
@PostMapping("/selctProductCount")
- public R selctProductCount( String year) {
+ public R selctProductCount(String year) {
return R.data(farmProductStockService.selctProductCount(year));
}
+ /**
+ * 小程序统计产量详情
+ *
+ * @param farmProductStock
+ * @return
+ */
+ @GetMapping("/statisticsProductx")
+ public R statisticsProductx(FarmProductStockVO farmProductStock, Query query) {
+ Double zwei = 0.0;
+ IPage<FarmProductStockVO> pages = farmProductStockService.statisticsProductx(Condition.getPage(query), farmProductStock);
+ for (int i = 0; i < pages.getRecords().size(); i++) {
+ String weight = pages.getRecords().get(i).getWeight();
+ Double a=Double.parseDouble(weight);
+ DecimalFormat df = new DecimalFormat("#.00");
+ String format = df.format(a);
+ //产量
+ Double wei = Double.parseDouble(format);
+ pages.getRecords().get(i).setWeight(format);
+ zwei += wei;
+ }
+ Map map = new HashMap();
+ List list = new ArrayList();
+ DecimalFormat df = new DecimalFormat("#.00");
+ String format = df.format(zwei);
+ map.put("zwei", format);
+ list.add(map);
+ list.add(pages);
+ return R.data(list);
+ }
+
+ /**
+ * 大屏经营概况库存数量与年产量
+ */
+ @GetMapping("/statisticsStockAndYield")
+ public R statisticsStockAndYield(String year,String deptId) {
+
+ //库存数量统计
+ Map map = new HashMap();
+ //统计当前库存农产品
+ Map<String, String> sum = farmProductStockService.statisticsStock(year, deptId);
+ //统计当前库存加工产品
+ Map<String, String> jgsum = null;
+ map.put("sum",sum.get("sum"));
+ map.put("jgsum",0);
+
+ //农产品年产量统计
+ List<Map<String, Double>> Nsum = farmProductStockService.statisticsYield(year, deptId);
+ double ncpNcl = Nsum.get(1).get("sum") + Nsum.get(0).get("sum");
+ System.out.println("cscsc"+ncpNcl);
+ System.out.println(map.get("sum"));
+
+ map.put("ncpNcl",ncpNcl + Double.parseDouble(map.get("sum").toString()));
+
+ //加工产品年产量统计
+ map.put("jgNcl",0);
+ return R.data(map);
+ }
+
}
--
Gitblit v1.9.3