From 2c0c30dbf04e1cfba46e0fc1392542be827e276d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 Aug 2022 11:50:47 +0800
Subject: [PATCH] 地块信息携带品种图片
---
src/main/java/org/springblade/modules/lang/controller/LandController.java | 2 +-
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 8 +++++++-
src/main/java/org/springblade/modules/lang/vo/LandVO.java | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/lang/controller/LandController.java b/src/main/java/org/springblade/modules/lang/controller/LandController.java
index deef58d..ff2bbac 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -365,7 +365,7 @@
if (unit.equals("0")) {
num += area1;
}
- if (unit.equals("1")) {
+ else if (unit.equals("1")) {
double v = area1 * 0.1;
num += v;
} else {
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index 3907596..4e647a7 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -26,7 +26,8 @@
c.dict_value as dica,
v.farm_name as deptname,
l.farm_id as farmId,
- l.land_type,l.type
+ l.land_type,l.type,
+ GROUP_CONCAT(a.url) AS strainUrl
FROM `sys_land` l
LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'land' AND is_deleted = 0 <if
test="land.tenantId!=null and land.tenantId != ''">
@@ -41,6 +42,10 @@
AND blade_dict_biz.tenant_id = #{land.tenantId}
</if> ) c ON c.dict_key = l.land_unit
LEFT JOIN ( SELECT id, farm_name FROM sys_farm ) v ON v.id = l.farm_id
+ LEFT JOIN
+ (
+ SELECT sfp.strain_id,strain.url,sfp.land_id FROM sys_farm_plant sfp LEFT JOIN sys_strain strain ON strain.id = sfp.strain_id WHERE sfp.`status` = 1
+ ) a ON l.id = a.land_id
where l.is_deleted = 0
<if test="land.landType!=null and land.landType != '' or land.landType == 0 ">
and l.land_type = #{land.landType}
@@ -60,6 +65,7 @@
<if test="land.farmId !=null and land.farmId !=''">
AND l.farm_id = #{land.farmId}
</if>
+ GROUP BY l.id,d.dict_value,c.dict_value
</select>
<!--查询地块列表（不分页）-->
diff --git a/src/main/java/org/springblade/modules/lang/vo/LandVO.java b/src/main/java/org/springblade/modules/lang/vo/LandVO.java
index be4feff..f53c480 100644
--- a/src/main/java/org/springblade/modules/lang/vo/LandVO.java
+++ b/src/main/java/org/springblade/modules/lang/vo/LandVO.java
@@ -35,6 +35,7 @@
String deptname;
String tenantId;
String strainId;
+ String strainUrl;
/**
* 种养品种植状态
*/
--
Gitblit v1.9.3