From 2648880bec1583ce4fe1886de65300f0a22638d0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 26 Sep 2022 17:09:31 +0800
Subject: [PATCH] 更改种类描述的判断方式、溯源时地图详情sql调整、农资出库时删除数据回滚修复、大屏接受数据增加展示判断
---
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 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 dbbfe7c..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;
@@ -72,6 +75,8 @@
private final ILandService landService;
+
+ private final StrainService strainService;
/**
* 详情
@@ -117,6 +122,15 @@
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);
+ }
+
/**
@@ -127,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));
}
@@ -180,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());
@@ -187,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");
@@ -195,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);
--
Gitblit v1.9.3