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/farmplant/controller/FarmPlantController.java | 150 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 128 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
index c34add1..3dd4c46 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -33,10 +33,13 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.farm.entity.FarmingRecord;
import org.springblade.modules.farm.service.FarmingRecordService;
import org.springblade.modules.farmplant.entity.FarmPlant;
+import org.springblade.modules.farmplant.entity.Strain;
import org.springblade.modules.farmplant.service.FarmPlantService;
+import org.springblade.modules.farmplant.service.StrainService;
import org.springblade.modules.farmplant.vo.FarmPlantVO;
import org.springblade.modules.farmplant.vo.StrainVO;
import org.springblade.modules.lang.entity.Land;
@@ -49,6 +52,7 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -71,6 +75,8 @@
private final ILandService landService;
+
+ private final StrainService strainService;
/**
* 详情
@@ -105,6 +111,27 @@
return R.data(pages);
}
+ /**
+ *首页当前种养产品总和
+ */
+ @GetMapping("/strainCount")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入farmPlant")
+ public R<IPage<FarmPlantVO>> strainCount(FarmPlantVO farmPlant, Query query) {
+ IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPageCount(Condition.getPage(query), farmPlant);
+ return R.data(pages);
+ }
+
+ /**
+ * 首页秧苗产品总和
+ */
+ @GetMapping("/strainCountYM")
+ public R<IPage<FarmPlantVO>> strainCountYM(FarmPlantVO farmPlant, Query query) {
+ IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPageCountYM(Condition.getPage(query), farmPlant);
+ return R.data(pages);
+ }
+
+
/**
* 查询种养记录列表（不分页）
@@ -114,6 +141,16 @@
@GetMapping("/getFarmPlantList")
public R getFarmPlantList(FarmPlantVO farmPlant) {
return R.data(farmplantService.getFarmPlantList(farmPlant));
+ }
+
+ /**
+ * 查询种养记录列表(秧苗)（不分页）
+ * @param farmPlant
+ * @return
+ */
+ @GetMapping("/getFarmPlantYMList")
+ public R getFarmPlantYMList(FarmPlantVO farmPlant) {
+ return R.data(farmplantService.getFarmPlantYMList(farmPlant));
}
@@ -137,7 +174,9 @@
if (res.get(i).getStrainId().equals(count.get(j).getStrainId())){
FarmPlantVO data = new FarmPlantVO();
data.setStrainId(res.get(i).getStrainId());
- data.setArea((Double.parseDouble(res.get(i).getArea()) + Double.parseDouble(count.get(j).getArea()))+"");
+ BigDecimal b1 = new BigDecimal(res.get(i).getArea());
+ BigDecimal b2 = new BigDecimal(count.get(j).getArea());
+ data.setArea(b1.add(b2).doubleValue()+"");
data.setStrainName(res.get(i).getStrainName());
count.set(j,data);
type = false;
@@ -165,6 +204,7 @@
farmPlant.setCreateTime(new Date());
boolean save = farmplantService.save(farmPlant);
if (save) {
+ Strain strain = strainService.getById(farmPlant.getStrainId());
//同时生成农事记录
FarmingRecord record = new FarmingRecord();
record.setCreateTime(new Date());
@@ -172,6 +212,7 @@
record.setTime(farmPlant.getTransplanTime());
record.setDeptId(farmPlant.getDeptId());
record.setTenantId(farmPlant.getTenantId());
+ record.setStrainId(farmPlant.getStrainId());
if (farmPlant.getPlantingWay().equals("0")) {
//移栽
record.setType("10");
@@ -180,9 +221,17 @@
//直播
record.setType("11");
}
+ if(farmPlant.getPlantingWay().equals("2")){
+ //秧苗
+ record.setType("13");
+ }
record.setLandId(farmPlant.getLandId());
record.setOperator(farmPlant.getCreateUser());
- record.setContent("品种: " + farmPlant.getVarieties());
+ if (StringUtil.isBlank(farmPlant.getVarieties())){
+ record.setContent("品种: " + strain.getStrainName());
+ }else {
+ record.setContent("品种: " + strain.getStrainName()+"-"+farmPlant.getVarieties());
+ }
//新增
farmingRecordService.save(record);
@@ -227,6 +276,32 @@
}
//更新并返回
return R.status(status);
+ }
+
+ @PostMapping("/overAll")
+ public R overAll(@RequestBody FarmPlantVO farmPlantVO){
+ boolean status = false;
+ for (int i=0;i<farmPlantVO.getIds().length;i++){
+ FarmPlant farmPlant = new FarmPlant();
+ farmPlant.setId(farmPlantVO.getIds()[i]);
+ farmPlant.setEndPlantTime(farmPlantVO.getEndPlantTime());
+ farmPlant.setStatus("2");
+ status = farmplantService.updateById(farmPlant);
+ //判断该地块是否还有种植的农产品
+ FarmPlant farmPlant2 = farmplantService.getById(farmPlant.getId());
+ FarmPlant farmPlant1 = new FarmPlant();
+ farmPlant1.setLandId(farmPlant2.getLandId());
+ farmPlant1.setStatus("1");
+ List<FarmPlant> list = farmplantService.list(new QueryWrapper<>(farmPlant1));
+ if (list.size() < 1) {
+ //更新该地块的耕种状态
+ Land land = new Land();
+ land.setType(1);
+ land.setId(Long.parseLong(farmPlant2.getLandId()));
+ landService.updateById(land);
+ }
+ }
+ return R.data(status);
}
/**
@@ -295,11 +370,41 @@
*/
@GetMapping("/pagePalnt")
public R pagePalnt(FarmPlantVO farmPlant, Query query) {
- int i = farmplantService.selectCount();
+ int num = farmplantService.selectCount(farmPlant);
IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
+ List<FarmPlantVO> res = pages.getRecords();
+ List<FarmPlantVO> count = new ArrayList<>();
+ //按种类合并种植物
+ for (int i = 0; i < res.size(); i++) {
+ if (i == 0){
+ count.add(res.get(0));
+ }else {
+ boolean type = false;
+ for (int j = 0; j < count.size(); j++) {
+ if (res.get(i).getStrainId().equals(count.get(j).getStrainId())){
+ FarmPlantVO data = new FarmPlantVO();
+ data.setStrainId(res.get(i).getStrainId());
+ BigDecimal b1 = new BigDecimal(res.get(i).getArea());
+ BigDecimal b2 = new BigDecimal(count.get(j).getArea());
+ data.setArea(b1.add(b2).doubleValue()+"");
+ data.setStrainName(res.get(i).getStrainName());
+ data.setUrl(res.get(i).getUrl());
+ count.set(j,data);
+ type = false;
+ break;
+ }else{
+ type = true;
+ }
+ }
+ if (type){
+ count.add(res.get(i));
+ }
+ }
+ }
+
Map map = new HashMap<>();
- map.put("num", i);
- map.put("page", pages);
+ map.put("num", num);
+ map.put("page", count);
return R.data(map);
}
@@ -356,24 +461,25 @@
*/
@GetMapping("/getFarmPlantStatisticsCountx")
public R getFarmPlantStatisticsCountx(FarmPlantVO farmPlant, Query query) {
- Double num = 0.0;
+// Double num = 0.0;
IPage<FarmPlantVO> pages = farmplantService.getFarmPlantStatisticsCountz(Condition.getPage(query), farmPlant);
- for (int i = 0; i < pages.getRecords().size(); i++) {
- String area = pages.getRecords().get(i).getArea();
- Double a = Double.parseDouble(area);
- DecimalFormat df = new DecimalFormat("#.00");
- String format = df.format(a);
- pages.getRecords().get(i).setArea(format);
- num += a;
- }
- Map map = new HashMap();
- List list = new ArrayList();
- DecimalFormat df = new DecimalFormat("#.00");
- String format = df.format(num);
- map.put("znum", format);
- list.add(map);
- list.add(pages);
- return R.data(list);
+// for (int i = 0; i < pages.getRecords().size(); i++) {
+// String area = pages.getRecords().get(i).getArea();
+// Double a = Double.parseDouble(area);
+// DecimalFormat df = new DecimalFormat("#.00");
+// String format = df.format(a);
+// pages.getRecords().get(i).setArea(format);
+// num += a;
+// }
+// Map map = new HashMap();
+// List list = new ArrayList();
+// DecimalFormat df = new DecimalFormat("#.00");
+// String format = df.format(num);
+// map.put("znum", format);
+// list.add(map);
+// list.add(pages);
+// return R.data(list);
+ return R.data(pages);
}
--
Gitblit v1.9.3