From 79fdda3c7bc986ff8af4403fc6a544bb5419a1ac Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 16 Jul 2022 18:04:08 +0800
Subject: [PATCH] 库存
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 4 ++--
src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java | 1 +
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 4 ++--
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 4 ++++
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml | 22 +++++++++++++---------
5 files changed, 22 insertions(+), 13 deletions(-)
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 51a8564..77ab691 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -301,8 +301,8 @@
<if test="farmPlant.endTime!=null and farmPlant.endTime!=''">
and sfp.transplan_time <= #{farmPlant.endTime}
</if>
- <if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
- and sfp.dept_id = #{farmPlant.deptId}
+ <if test="farmPlant.farmId!=null and farmPlant.farmId!=''">
+ and sl.farm_id = #{farmPlant.farmId}
</if>
<if test="farmPlant.status!=null and farmPlant.status!=''">
and sfp.status = #{farmPlant.status}
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
index 9549bd8..74a1fd8 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -61,6 +61,7 @@
select sfps.id,sfps.strain_id strainId,sum(sfps.weight) weight,ss.url,ss.strain_name strainName from
sys_farm_product_stock sfps
left join sys_strain ss on ss.id = sfps.strain_id
+ LEFT JOIN sys_land sl ON sl.id = sfps.land_id
where 1=1
<if test="farmProductStock.strainId!=null and farmProductStock.strainId!=''">
and sfps.strain_id = #{farmProductStock.strainId}
@@ -80,6 +81,9 @@
<if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''">
and sfps.tenant_id = #{farmProductStock.tenantId}
</if>
+ <if test="farmProductStock.farmId!=null and farmProductStock.farmId!=''">
+ and sl.farm_id = #{farmProductStock.farmId}
+ </if>
group by sfps.id,sfps.strain_id,ss.url,ss.strain_name
</select>
diff --git a/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java b/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
index 71eb9b5..a5c38e4 100644
--- a/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
+++ b/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
@@ -32,5 +32,6 @@
* 结束时间
*/
private String endTime;
+ private String farmId;
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 59977ec..393e48d 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -36,8 +36,8 @@
<if test="task.taskUser!=null and task.taskUser!=''">
and t.task_user=#{task.taskUser}
</if>
- <if test="task.User!=null and task.User!=''">
- and t.create_user=#{task.User}
+ <if test="task.farmId!=null and task.farmId!=''">
+ and l.farm_id = #{task.farmId}
</if>
</select>
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 37856e6..01cf2c8 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -6,12 +6,13 @@
<select id="selectTraceabilityPage" 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 sl.id = sr.land_id
where 1=1
<if test="traceability.code!=null and traceability.code!=''">
and st.code like concat('%',#{traceability.code},'%')
</if>
- <if test="traceability.deptId!=null and traceability.deptId!=''">
- and st.dept_id = #{traceability.deptId}
+ <if test="traceability.farmId!=null and traceability.farmId!=''">
+ and sl.farm_id = #{traceability.farmId}
</if>
<if test="traceability.tenantId!=null and traceability.tenantId!=''">
and st.tenant_id = #{traceability.tenantId}
@@ -39,17 +40,20 @@
</select>
<select id="selectRevorid" resultType="java.lang.String">
- select recovery_id from sys_traceability where code=#{code}
+ select recovery_id
+ from sys_traceability
+ where code = #{code}
</select>
<!--获取溯源简介信息-->
<select id="getSimpleInfo" resultType="org.springblade.modules.traceability.dto.TraceabilityDTO">
- SELECT concat(sf.farm_name,'-',ifnull(sl.land_name,'-'),'-',ss.strain_name,'-',sr.time,' 采收') remark FROM `sys_traceability` st
- left join blade_dept bd on bd.id = st.dept_id
- left join sys_recovery sr on sr.id = st.recovery_id
- left join sys_land sl on sl.id = sr.land_id
- left join sys_strain ss on ss.id = sr.strain_id
- left join sys_farm sf on sf.dept_id = bd.id
+ SELECT concat(sf.farm_name, '-', ifnull(sl.land_name, '-'), '-', ss.strain_name, '-', sr.time, ' 采收') remark
+ FROM `sys_traceability` st
+ left join blade_dept bd on bd.id = st.dept_id
+ left join sys_recovery sr on sr.id = st.recovery_id
+ left join sys_land sl on sl.id = sr.land_id
+ left join sys_strain ss on ss.id = sr.strain_id
+ left join sys_farm sf on sf.dept_id = bd.id
where st.code = #{traceability.code}
</select>
</mapper>
--
Gitblit v1.9.3