From 1d829b91fcfa295ecc3e32dd7c105fe372789065 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 13 Sep 2022 17:44:01 +0800
Subject: [PATCH] 农事记录content添加品种名称，大屏查询未删除数据，农产品投入
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 2 +-
src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java | 7 +++++--
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 2 +-
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 19 ++++++++++++++++++-
4 files changed, 25 insertions(+), 5 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 a216c2f..8cfca56 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
@@ -29,6 +29,8 @@
import org.springblade.modules.farm.entity.FarmingRecord;
import org.springblade.modules.farm.service.FarmingRecordService;
import org.springblade.modules.farm.vo.FarmingRecordVO;
+import org.springblade.modules.farmplant.entity.Strain;
+import org.springblade.modules.farmplant.service.StrainService;
import org.springblade.modules.soldr.entity.Soldr;
import org.springblade.modules.soldr.service.ISoldrService;
import org.springblade.modules.soldrecord.service.ISoldrecordService;
@@ -58,7 +60,7 @@
private final ISoldrService soldrService;
private final ISoldrecordService soldrecordService;
private final IStockfactoryService stockfactoryService;
-
+ private final StrainService strainService;
/**
* 详情
*/
@@ -177,7 +179,8 @@
stockfactory.setId(ids);
Stockfactory detailstock = stockfactoryService.getOne(Condition.getQueryWrapper(stockfactory));
String agriculturalName = detailstock.getAgriculturalName();
- String content = agriculturalName + " " + v + "公斤";
+ Strain strain = strainService.getById(farm.getStrainId());
+ String content =strain.getStrainName()+"-"+ agriculturalName + " " + v + "公斤";
farm.setContent(content);
//使用农资数量等于已出农资数量
if (farm.getSnum() == detail.getAmount1()) {
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 43c7260..0bb238b 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -4,7 +4,7 @@
<!--自定义查询农场养殖记录分页数据-->
<select id="selectFarmPlantPage" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
- select sfp.*,ss.strain_name strainName,ss.url,sl.land_name landName,sl.land_area area,land_unit landUnit,bdb.dict_value dica,a.farm_id AS otherFarmId
+ select DISTINCT sfp.*,ss.strain_name strainName,ss.url,sl.land_name landName,sl.land_area area,land_unit landUnit,bdb.dict_value dica,a.farm_id AS otherFarmId
,(SELECT IFNULL(SUM(r.weight),0) from sys_recovery r where sfp.land_id = r.land_id and sfp.strain_id = r.strain_id) as outputNum
from
sys_farm_plant sfp
diff --git a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
index ab93b76..bf912cd 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -145,7 +145,7 @@
sys_sale sale
LEFT JOIN sys_district dis ON sale.sale_destination = dis.CODE
LEFT JOIN sys_land sl ON sl.id = sale.land_id
- WHERE 1 = 1
+ WHERE 1 = 1 AND sale.is_deleted = 0
<if test="startTime != null and startTime != ''">
and sale_time >= #{startTime}
</if>
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 98244f2..60a03c4 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -181,13 +181,16 @@
</select>
<select id="countTaskNum" resultType="java.util.HashMap">
+ <!--已完成 -->
SELECT count( * ) AS count FROM sys_task st
left join sys_land sl on sl.id = st.land_id
WHERE 1 = 1
AND st.STATUS = '0'
AND st.create_time like concat('%',#{task.year},'%')
AND sl.farm_id = #{task.farmId}
+ AND st.is_deleted = 0
UNION ALL
+ <!--未完成 -->
SELECT count( * ) AS count FROM sys_task st
left join sys_land sl on sl.id = st.land_id
WHERE
@@ -195,14 +198,28 @@
AND ( st.STATUS = '1' OR st.STATUS = '2' )
AND st.create_time like concat('%',#{task.year},'%')
AND sl.farm_id = #{task.farmId}
+ AND st.is_deleted = 0
UNION ALL
+ <!--超期完成 -->
+ SELECT count( * ) AS count FROM sys_task st
+ left join sys_land sl on sl.id = st.land_id
+ WHERE
+ 1 = 1
+ AND st.STATUS = '0'
+ AND st.create_time like concat('%',#{task.year},'%')
+ AND st.update_time > DATE_ADD(st.time,INTERVAL 1 DAY)
+ AND sl.farm_id = #{task.farmId}
+ AND st.is_deleted = 0
+ UNION ALL
+ <!--超期未完成 -->
SELECT count( * ) AS count FROM sys_task st
left join sys_land sl on sl.id = st.land_id
WHERE
1 = 1
AND ( st.STATUS = '1' OR st.STATUS = '2' )
- AND st.create_time like concat('%',#{task.year},'%')
+ AND st.create_time like concat('%',#{task.year},'%')
AND now() > st.time
AND sl.farm_id = #{task.farmId}
+ AND st.is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3