From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作，种植记录查询新增，地块，溯源码查询修改
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 22 +++++++
src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java | 10 +++
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 11 +++
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.java | 7 ++
src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java | 7 ++
src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java | 7 ++
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 3 +
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml | 4 +
src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java | 9 +++
src/main/java/org/springblade/modules/traceability/entity/Traceability.java | 2
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 25 ++++++++
src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java | 4 +
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java | 7 ++
src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java | 5 +
src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java | 2
src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java | 10 +++
src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java | 5 +
17 files changed, 138 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
index 556f016..9e1a961 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
@@ -93,6 +93,16 @@
}
/**
+ * 查询农事操作记录（不分页）
+ * @param farm
+ * @return
+ */
+ @GetMapping("/getFarmingRecordList")
+ public R getFarmingRecordList(FarmingRecordVO farm) {
+ return R.data(farmService.getFarmingRecordListfarm(farm));
+ }
+
+ /**
* 新增
*/
@PostMapping("/save")
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
index d5aed7a..4a4002a 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
@@ -67,4 +67,11 @@
* @return
*/
List<FarmingRecordVO> getFarmingRecordByFarmPlantId(@Param("recovery") RecoveryVO recoveryVO);
+
+ /**
+ * 查询农事操作记录（不分页）
+ * @param farm
+ * @return
+ */
+ List<FarmingRecordVO> getFarmingRecordListfarm(@Param("farm") FarmingRecordVO farm);
}
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 be86e9c..06562e3 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -156,4 +156,29 @@
and strain_id = #{recovery.strainId}
order by sfr.time asc,sfr.create_time asc
</select>
+
+ <!--查询农事操作记录（不分页）-->
+ <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
+ 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
+ where sl.farm_id = #{farm.farmId}
+ order by sfr.time desc,sfr.create_time desc
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java b/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
index 24c699a..7082f4f 100644
--- a/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
+++ b/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
@@ -51,4 +51,11 @@
* @return
*/
List<FarmingRecordVO> getFarmingRecordByFarmPlantId(RecoveryVO recoveryVO);
+
+ /**
+ * 查询农事操作记录（不分页）
+ * @param farm
+ * @return
+ */
+ List<FarmingRecordVO> getFarmingRecordListfarm(FarmingRecordVO farm);
}
diff --git a/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java b/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
index fbc4b11..a46d225 100644
--- a/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
@@ -106,4 +106,14 @@
public List<FarmingRecordVO> getFarmingRecordByFarmPlantId(RecoveryVO recoveryVO) {
return baseMapper.getFarmingRecordByFarmPlantId(recoveryVO);
}
+
+ /**
+ * 查询农事操作记录（不分页）
+ * @param farm
+ * @return
+ */
+ @Override
+ public List<FarmingRecordVO> getFarmingRecordListfarm(FarmingRecordVO farm) {
+ return baseMapper.getFarmingRecordListfarm(farm);
+ }
}
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 b31c660..c87c04c 100644
--- a/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
+++ b/src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
@@ -36,4 +36,9 @@
* 品种名称
*/
private String strainName;
+
+ /**
+ * 农场id
+ */
+ private String farmId;
}
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 6584403..c34add1 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -107,6 +107,17 @@
/**
+ * 查询种养记录列表（不分页）
+ * @param farmPlant
+ * @return
+ */
+ @GetMapping("/getFarmPlantList")
+ public R getFarmPlantList(FarmPlantVO farmPlant) {
+ return R.data(farmplantService.getFarmPlantList(farmPlant));
+ }
+
+
+ /**
* 分页统计
*/
@GetMapping("/pageCount")
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 37ee67e..fe50901 100644
--- a/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
+++ b/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
@@ -125,7 +125,7 @@
/**
- * 农场id
+ * 部门id
*/
private String deptId;
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.java b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.java
index f21ab63..a98671d 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.java
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.java
@@ -68,4 +68,11 @@
Map selectProductr(String code, String time);
Map selectProducts(String code, String time);
Map selectProductf(String code, String time);
+
+ /**
+ * 查询种养记录列表（不分页）
+ * @param farmPlant
+ * @return
+ */
+ List<FarmPlantVO> getFarmPlantList(@Param("farmPlant") FarmPlantVO farmPlant);
}
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 b17b9d6..c8e5b5e 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -304,4 +304,26 @@
group by sfp.strain_id,strain_name,land_unit
</select>
+ <!--查询种养记录列表（不分页）-->
+ <select id="getFarmPlantList" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
+ SELECT
+ sfp.*,
+ ss.strain_name strainName,
+ sl.land_unit landUnit
+ FROM
+ sys_farm_plant sfp
+ LEFT JOIN sys_strain ss ON ss.id = sfp.strain_id
+ LEFT JOIN sys_land sl ON sl.id = sfp.land_id
+ where 1=1
+ <if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
+ and sfp.dept_id = #{farmPlant.deptId}
+ </if>
+ <if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
+ and sfp.tenant_id = #{farmPlant.tenantId}
+ </if>
+ <if test="farmPlant.farmId!=null and farmPlant.farmId!=''">
+ and sl.farm_id = #{farmPlant.farmId}
+ </if>
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java b/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java
index 4fab270..ed4bb79 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java
@@ -59,4 +59,11 @@
Map selectProductr(String code, String time);
Map selectProducts(String code, String time);
Map selectProductf(String code, String time);
+
+ /**
+ * 查询种养记录列表（不分页）
+ * @param farmPlant
+ * @return
+ */
+ List<FarmPlantVO> getFarmPlantList(FarmPlantVO farmPlant);
}
diff --git a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
index 776c7da..92beff9 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
@@ -187,4 +187,13 @@
return baseMapper.selectProductf(code, time);
}
+ /**
+ * 查询种养记录列表（不分页）
+ * @param farmPlant
+ * @return
+ */
+ @Override
+ public List<FarmPlantVO> getFarmPlantList(FarmPlantVO farmPlant) {
+ return baseMapper.getFarmPlantList(farmPlant);
+ }
}
diff --git a/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java b/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
index a2cb7d5..b123b0e 100644
--- a/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
+++ b/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
@@ -61,4 +61,9 @@
* 大屏年月日查询
*/
private String year;
+
+ /**
+ * 农场id
+ */
+ private String farmId;
}
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 482ea63..3a83ae7 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -81,6 +81,9 @@
<if test="land.tenantId!=null and land.tenantId != ''">
and tenant_id =#{land.tenantId}
</if>
+ <if test="land.farmId!=null and land.farmId != ''">
+ and farm_id =#{land.farmId}
+ </if>
</select>
<insert id="saveLandInfo">
diff --git a/src/main/java/org/springblade/modules/traceability/entity/Traceability.java b/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
index d7ad4fd..c47a861 100644
--- a/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
+++ b/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
@@ -87,7 +87,7 @@
private Integer recoveryId;
/**
- * 农场id
+ * 单位id
*/
private String deptId;
diff --git a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
index 2fbeef9..37856e6 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -22,6 +22,7 @@
<select id="getTraceabilityList" resultType="org.springblade.modules.traceability.vo.TraceabilityVO">
select st.* from sys_traceability st
left join sys_recovery sr on st.recovery_id = sr.id
+ left join sys_land sl on sr.land_id = sl.id
where 1=1
<if test="traceability.code!=null and traceability.code!=''">
and st.code like concat('%',#{traceability.code},'%')
@@ -32,6 +33,9 @@
<if test="traceability.tenantId!=null and traceability.tenantId!=''">
and st.tenant_id = #{traceability.tenantId}
</if>
+ <if test="traceability.farmId!=null and traceability.farmId!=''">
+ and sl.farm_id = #{traceability.farmId}
+ </if>
</select>
<select id="selectRevorid" resultType="java.lang.String">
diff --git a/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java b/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java
index 75c4233..d342f3d 100644
--- a/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java
+++ b/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java
@@ -12,4 +12,8 @@
public class TraceabilityVO extends Traceability {
private static final long serialVersionUID = 1L;
+ /**
+ * 农场id
+ */
+ private String farmId;
}
--
Gitblit v1.9.3