From 54d271cb931f95976993eb69b1b71b91c65ebcc8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 10:09:30 +0800
Subject: [PATCH] 增加秧苗方式，修正今年农资使用量为0的问题
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 4 ++--
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 2 +-
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 4 ++++
src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java | 4 ++++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
index 7841a81..e83d95d 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -167,7 +167,7 @@
left join sys_land sl on sl.id = sfr.land_id
WHERE
YEAR(sfr.time) = YEAR(NOW())
- AND sfr.stock_id != NULL
+ AND sfr.stock_id != ""
and sl.farm_id=#{farmId}
</select>
<!--去年农资使用量-->
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..3f1e60f 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -195,6 +195,10 @@
//直播
record.setType("11");
}
+ if(farmPlant.getPlantingWay().equals("2")){
+ //秧苗
+ record.setType("13");
+ }
record.setLandId(farmPlant.getLandId());
record.setOperator(farmPlant.getCreateUser());
record.setContent("品种: " + farmPlant.getVarieties());
diff --git a/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java b/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
index 1a85084..a526911 100644
--- a/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
+++ b/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
@@ -139,4 +139,8 @@
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endPlantTime;
+ /**
+ * 移栽时，移栽来源的地块id
+ */
+ private String otherLandId;
}
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
index 5685a50..ac473f4 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -403,9 +403,9 @@
<!-- and sfp.tenant_id = #{farmPlant.tenantId}-->
<!-- </if>-->
<!-- group by sfp.strain_id,strain_name,land_unit-->
- SELECT a.strain_id,a.strainName,SUM(TRUNCATE(a.land_area,3)) areas FROM
+ SELECT a.strain_id,a.strainName,SUM(TRUNCATE(a.land_area,3)) areas,a.url FROM
(
- select sfp.strain_id,
+ select sfp.strain_id,ss.url,
ss.strain_name strainName,
( CASE WHEN land_unit = 2 THEN FORMAT(sl.land_area * 0.0015,3) WHEN land_unit = 1 THEN sl.land_area * 0.1 ELSE sl.land_area END ) land_area,
land_unit landUnit
--
Gitblit v1.9.3