From 8a1b4a973e598688b9cc9e05c6f34e13c4fa9d73 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 11 Jul 2022 15:21:20 +0800
Subject: [PATCH] kuc管理
---
src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml | 5 ++
src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java | 12 ++++++
src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java | 1
src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java | 1
src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java | 5 ++
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java | 1
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 11 +++++
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 26 +++++++++++++
src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java | 1
src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java | 5 ++
10 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
index 56c3aa5..894cf67 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -66,6 +66,17 @@
}
/**
+ * 自定义分页
+ */
+ @GetMapping("/pages")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入farmProductStock")
+ public R<List<FarmProductStockVO>> pages(FarmProductStockVO farmProductStock) {
+ List<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPages(farmProductStock);
+ return R.data(pages);
+ }
+
+ /**
* 统计产量
*
* @param farmProductStock
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
index 92fb4d2..0238b34 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
@@ -25,6 +25,7 @@
* @return
*/
List<FarmProductStockVO> selectFarmProductStockPage(@Param("page") IPage page, @Param("farmProductStock") FarmProductStockVO farmProductStock);
+ List<FarmProductStockVO> selectFarmProductStockPages(@Param("farmProductStock") FarmProductStockVO farmProductStock);
/**
* 统计产量
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 b1738b1..1361dc9 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -29,6 +29,32 @@
group by sfps.strain_id,ss.url,ss.strain_name
</select>
+ <select id="selectFarmProductStockPages" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
+ select 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
+ where 1=1
+ <if test="farmProductStock.strainId!=null and farmProductStock.strainId!=''">
+ and sfps.strain_id = #{farmProductStock.strainId}
+ </if>
+ <if test="farmProductStock.leaves!=null and farmProductStock.leaves!=''">
+ and sfps.leaves = #{farmProductStock.leaves}
+ </if>
+ <if test="farmProductStock.startTime!=null and farmProductStock.startTime!=''">
+ and sfps.time >= #{farmProductStock.startTime}
+ </if>
+ <if test="farmProductStock.endTime!=null and farmProductStock.endTime!=''">
+ and sfps.time <= #{farmProductStock.endTime}
+ </if>
+ <if test="farmProductStock.deptId!=null and farmProductStock.deptId!=''">
+ and sfps.dept_id = #{farmProductStock.deptId}
+ </if>
+ <if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''">
+ and sfps.tenant_id = #{farmProductStock.tenantId}
+ </if>
+ group by sfps.strain_id,ss.url,ss.strain_name
+ </select>
+
<!--查询农产品库存数据-->
<select id="statisticsProduct" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
diff --git a/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java b/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java
index 1083cad..c18b35d 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java
@@ -24,6 +24,7 @@
* @return
*/
IPage<FarmProductStockVO> selectFarmProductStockPage(IPage<FarmProductStockVO> page, FarmProductStockVO farmProductStock);
+ List<FarmProductStockVO> selectFarmProductStockPages(FarmProductStockVO farmProductStock);
/**
* 统计产量
diff --git a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
index dacf4c2..c87451b 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
@@ -30,6 +30,11 @@
return page.setRecords(baseMapper.selectFarmProductStockPage(page, farmProductStock));
}
+ @Override
+ public List<FarmProductStockVO> selectFarmProductStockPages(FarmProductStockVO farmProductStock) {
+ return baseMapper.selectFarmProductStockPages(farmProductStock);
+ }
+
/**
* 统计产量
* @param farmProductStock
diff --git a/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java b/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
index f9b5b99..90a3a7e 100644
--- a/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
+++ b/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
@@ -35,6 +35,8 @@
import org.springblade.modules.stockfactory.service.IStockfactoryService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+
/**
* 农资厂家表 控制器
*
@@ -81,6 +83,16 @@
IPage<StockfactoryVO> pages = stockfactoryService.selectStockfactoryPage(Condition.getPage(query), stockfactory);
return R.data(pages);
}
+ /**
+ * 自定义分页 农资厂家表
+ */
+ @GetMapping("/pages")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入stockfactory")
+ public R<List<StockfactoryVO>> pages(StockfactoryVO stockfactory) {
+ List<StockfactoryVO> pages = stockfactoryService.selectStockfactoryPages(stockfactory);
+ return R.data(pages);
+ }
/**
* 新增 农资厂家表
diff --git a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java
index e50b7d5..adfad8b 100644
--- a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java
+++ b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java
@@ -38,6 +38,7 @@
* @return
*/
List<StockfactoryVO> selectStockfactoryPage(IPage page, StockfactoryVO stockfactory);
+ List<StockfactoryVO> selectStockfactoryPages( StockfactoryVO stockfactory);
List selectStockFa();
List selectStockIn();
}
diff --git a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
index d6f5d5c..442a1f9 100644
--- a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
+++ b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
@@ -24,6 +24,11 @@
from sys_stockfactory
where is_deleted = 0
</select>
+ <select id="selectStockfactoryPages" resultMap="stockfactoryResultMap">
+ select *
+ from sys_stockfactory
+ where is_deleted = 0
+ </select>
<select id="selectStockFa" resultType="java.util.HashMap">
select id as dictKey, agricultural_name as dictValue
diff --git a/src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java b/src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java
index bde90ba..589470e 100644
--- a/src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java
+++ b/src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java
@@ -39,6 +39,7 @@
* @return
*/
IPage<StockfactoryVO> selectStockfactoryPage(IPage<StockfactoryVO> page, StockfactoryVO stockfactory);
+ List<StockfactoryVO> selectStockfactoryPages(StockfactoryVO stockfactory);
List selectStockFa();
List selectStockIn();
}
diff --git a/src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java b/src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java
index 8d99c23..ef51c07 100644
--- a/src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java
+++ b/src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java
@@ -41,6 +41,11 @@
}
@Override
+ public List<StockfactoryVO> selectStockfactoryPages(StockfactoryVO stockfactory) {
+ return baseMapper.selectStockfactoryPages(stockfactory);
+ }
+
+ @Override
public List selectStockFa() {
return baseMapper.selectStockFa();
}
--
Gitblit v1.9.3