From f19466234f66b9960b8aeae2d137ab9e50f447ad Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 13 Sep 2022 14:35:22 +0800
Subject: [PATCH] 没有写品种时填写选择种类的名称
---
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 13 ++++++++++++-
1 files changed, 12 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 d44480e..1dc44fa 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -36,7 +36,9 @@
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 +74,8 @@
private final ILandService landService;
+
+ private final StrainService strainService;
/**
* 详情
@@ -199,6 +203,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());
@@ -206,6 +211,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");
@@ -220,7 +226,12 @@
}
record.setLandId(farmPlant.getLandId());
record.setOperator(farmPlant.getCreateUser());
- record.setContent("品种: " + farmPlant.getVarieties());
+ if (farmPlant.getVarieties().equals("")){
+ record.setContent("品种: " + strain.getStrainName());
+
+ }else {
+ record.setContent("品种: " + strain.getStrainName()+"-"+farmPlant.getVarieties());
+ }
//新增
farmingRecordService.save(record);
--
Gitblit v1.9.3