From 85de465560468fe08f6d846e2d6beacb20b71da3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 14 Jul 2022 17:04:21 +0800
Subject: [PATCH] 地块统计接口修改
---
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 34 +++++++++--------
src/main/java/org/springblade/modules/lang/mapper/LandMapper.java | 8 ++--
src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java | 16 ++++----
src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java | 5 ++
src/main/java/org/springblade/modules/lang/controller/LandController.java | 20 +++++-----
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 28 ++++++++++----
src/main/java/org/springblade/modules/lang/service/ILandService.java | 8 ++--
7 files changed, 69 insertions(+), 50 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 f249185..da82f42 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -162,24 +162,26 @@
<!--查询农事操作记录（不分页）-->
<select id="getFarmingRecordListfarm" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
select sfr.*,case
- when sfr.type = 0 then '施肥'
- when sfr.type = 1 then '翻耕'
- when sfr.type = 2 then '灌溉'
- when sfr.type = 3 then '起垄'
- when sfr.type = 4 then '用药'
- when sfr.type = 5 then '追肥'
- when sfr.type = 6 then '除草'
- when sfr.type = 7 then '修剪'
- when sfr.type = 8 then '浸种'
- when sfr.type = 9 then '拌种'
- when sfr.type = 10 then '移栽'
- when sfr.type = 11 then '直播'
- when sfr.type = 12 then '采收'
- else '其他' end as typeName,sl.land_name landName,ss.strain_name strainName,bu.real_name realName
+ when sfr.type = 0 then '施肥'
+ when sfr.type = 1 then '翻耕'
+ when sfr.type = 2 then '灌溉'
+ when sfr.type = 3 then '起垄'
+ when sfr.type = 4 then '用药'
+ when sfr.type = 5 then '追肥'
+ when sfr.type = 6 then '除草'
+ when sfr.type = 7 then '修剪'
+ when sfr.type = 8 then '浸种'
+ when sfr.type = 9 then '拌种'
+ when sfr.type = 10 then '移栽'
+ when sfr.type = 11 then '直播'
+ when sfr.type = 12 then '采收'
+ else '其他' end as typeName,sl.land_name landName,ss.strain_name strainName,
+ bu.real_name realName,ss1.agricultural_name agriculturalName
from sys_farming_record sfr
left join blade_user bu on bu.id = sfr.operator
- left join sys_land sl on sl.id = sfr.land_id
- left join sys_strain ss on ss.id = sfr.strain_id
+ left join sys_land sl on sl.id = sfr.land_id
+ left join sys_strain ss on ss.id = sfr.strain_id
+ left join sys_stockfactory ss1 on ss1.id = sfr.stock_id
where 1=1
<if test="farm.landId!=null and farm.landId!=''">
and sfr.land_id = #{farm.landId}
diff --git a/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java b/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
index c87c04c..c41a561 100644
--- a/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
+++ b/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
@@ -41,4 +41,9 @@
* 农场id
*/
private String farmId;
+
+ /**
+ * 肥料名称
+ */
+ private String agriculturalName;
}
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 4b1f7e2..847ecb8 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -269,10 +269,10 @@
* 首页地块统计接口
*/
@GetMapping("/selectCount")
- public R selectCount(String deptId) {
- List<Map<String, Object>> list = landService.selectZAre(deptId);
- List<Map<String, Object>> lists = landService.selectSAre(deptId);
- List list1 = landService.selectNum(deptId);
+ public R selectCount(LandVO land) {
+ List<Map<String, Object>> list = landService.selectZAre(land);
+ List<Map<String, Object>> lists = landService.selectSAre(land);
+ List list1 = landService.selectNum(land);
//总面积
Double num = 0.0;
for (int i = 0; i < list.size(); i++) {
@@ -339,15 +339,15 @@
/**
* 大屏地块统计接口
- * @param framId 农场id
+ * @param land 农场
* @return
*/
@GetMapping("/selectXCount")
- public R selectXCount(String framId) {
- List<Map<String, Object>> list = landService.selectZAre(framId);
- List<Map<String, Object>> lists = landService.selectSAre(framId);
- List<Map<String, Object>> listw = landService.selectWAre(framId);
- List list1 = landService.selectNum(framId);
+ public R selectXCount(LandVO land) {
+ List<Map<String, Object>> list = landService.selectZAre(land);
+ List<Map<String, Object>> lists = landService.selectSAre(land);
+ List<Map<String, Object>> listw = landService.selectWAre(land);
+ List list1 = landService.selectNum(land);
//总面积
Double num = 0.0;
for (int i = 0; i < list.size(); i++) {
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
index f020b79..88986c7 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
@@ -66,13 +66,13 @@
List selectLandList(String userid);
- List selectNum(@Param("farmId") String farmId);
+ List selectNum(@Param("land") LandVO land);
- List<Map<String, Object>> selectZAre(@Param("farmId") String farmId);
+ List<Map<String, Object>> selectZAre(@Param("land") LandVO land);
- List<Map<String, Object>> selectSAre(@Param("farmId") String farmId);
+ List<Map<String, Object>> selectSAre(@Param("land") LandVO land);
- List<Map<String, Object>> selectWAre(@Param("farmId") String farmId);
+ List<Map<String, Object>> selectWAre(@Param("land") LandVO land);
/**
* 地块列表（不分页）
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 da1e7a9..9f8f0b5 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -144,8 +144,11 @@
<select id="selectZAre" resultType="java.util.HashMap">
SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit FROM sys_land
WHERE is_deleted = 0
- <if test="farmId!= null and farmId!=''">
- and farm_id=#{farmId}
+ <if test="land.farmId!= null and land.farmId!=''">
+ and sl.farm_id=#{land.farmId}
+ </if>
+ <if test="land.deptId!= null and land.deptId!=''">
+ and sl.dept_id=#{land.deptId}
</if>
</select>
<!--土地使用面积-->
@@ -154,8 +157,11 @@
FROM sys_land
WHERE is_deleted = 0
and type = 0
- <if test="farmId!= null and farmId!=''">
- and farm_id=#{farmId}
+ <if test="land.farmId!= null and land.farmId!=''">
+ and sl.farm_id=#{land.farmId}
+ </if>
+ <if test="land.deptId!= null and land.deptId!=''">
+ and sl.dept_id=#{land.deptId}
</if>
</select>
<!--土地未使用面积-->
@@ -164,8 +170,11 @@
FROM sys_land
WHERE is_deleted = 0
and type = 1
- <if test="farmId!= null and farmId!=''">
- and farm_id=#{farmId}
+ <if test="land.farmId!= null and land.farmId!=''">
+ and sl.farm_id=#{land.farmId}
+ </if>
+ <if test="land.deptId!= null and land.deptId!=''">
+ and sl.dept_id=#{land.deptId}
</if>
</select>
@@ -173,8 +182,11 @@
SELECT strain_id FROM sys_farm_plant sfp
left join sys_land sl on sl.id = sfp.land_id
WHERE sfp.status = 1
- <if test="farmId!= null and farmId!=''">
- and sl.farm_id=#{farmId}
+ <if test="land.farmId!= null and land.farmId!=''">
+ and sl.farm_id=#{land.farmId}
+ </if>
+ <if test="land.deptId!= null and land.deptId!=''">
+ and sl.dept_id=#{land.deptId}
</if>
GROUP BY sfp.strain_id
</select>
diff --git a/src/main/java/org/springblade/modules/lang/service/ILandService.java b/src/main/java/org/springblade/modules/lang/service/ILandService.java
index f9295f6..1ea559c 100644
--- a/src/main/java/org/springblade/modules/lang/service/ILandService.java
+++ b/src/main/java/org/springblade/modules/lang/service/ILandService.java
@@ -73,10 +73,10 @@
* 土地总面积
* @return
*/
- List<Map<String, Object>> selectZAre(String deptId);
- List<Map<String, Object>> selectSAre(String deptId);
- List<Map<String, Object>> selectWAre(String deptId);
- List selectNum(String deptId);
+ List<Map<String, Object>> selectZAre(LandVO land);
+ List<Map<String, Object>> selectSAre(LandVO land);
+ List<Map<String, Object>> selectWAre(LandVO land);
+ List selectNum(LandVO land);
/**
* 地块列表（不分页）
diff --git a/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java b/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
index 5685089..7b5314a 100644
--- a/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
+++ b/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
@@ -71,23 +71,23 @@
}
@Override
- public List<Map<String, Object>> selectZAre(String deptId) {
- return baseMapper.selectZAre(deptId);
+ public List<Map<String, Object>> selectZAre(LandVO land) {
+ return baseMapper.selectZAre(land);
}
@Override
- public List<Map<String, Object>> selectSAre(String deptId) {
- return baseMapper.selectSAre(deptId);
+ public List<Map<String, Object>> selectSAre(LandVO land) {
+ return baseMapper.selectSAre(land);
}
@Override
- public List<Map<String, Object>> selectWAre(String deptId) {
- return baseMapper.selectWAre(deptId);
+ public List<Map<String, Object>> selectWAre(LandVO land) {
+ return baseMapper.selectWAre(land);
}
@Override
- public List selectNum(String deptId) {
- return baseMapper.selectNum(deptId);
+ public List selectNum(LandVO land) {
+ return baseMapper.selectNum(land);
}
/**
--
Gitblit v1.9.3