From bb365068dd8ea2586106c4152e8e5f773ddd7f87 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 13 May 2022 09:42:23 +0800
Subject: [PATCH] 农资管理
---
src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/stock/service/IStockService.java | 2 +-
src/main/java/org/springblade/modules/stock/mapper/StrainService.xml | 36 +++++++++++++++++++++++++++++++++++-
src/main/java/org/springblade/modules/stock/mapper/StockMapper.java | 2 +-
src/main/java/org/springblade/modules/stock/controller/StockController.java | 2 +-
5 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stock/controller/StockController.java b/src/main/java/org/springblade/modules/stock/controller/StockController.java
index ab08a0f..42503c1 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -82,7 +82,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入stock")
public R<IPage<StockVO>> page(StockVO stock, Query query) {
- IPage<StockVO> pages = stockService.seletList(Condition.getPage(query), stock);
+ IPage<StockVO> pages = stockService.selectLists(Condition.getPage(query), stock);
for (int i=0;i<pages.getRecords().size();i++){
String specs = pages.getRecords().get(i).getSpecs();
String dic1 = pages.getRecords().get(i).getDic1();
diff --git a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java
index 45eb0ea..c06d1a5 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java
@@ -38,6 +38,6 @@
* @return
*/
List<StockVO> selectStockPage(IPage page, StockVO stock);
- List<StockVO> seletList(IPage page, StockVO stock);
+ List<StockVO> selectLists(IPage page, StockVO stock);
}
diff --git a/src/main/java/org/springblade/modules/stock/mapper/StrainService.xml b/src/main/java/org/springblade/modules/stock/mapper/StrainService.xml
index 9d4664c..ff4c038 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StrainService.xml
+++ b/src/main/java/org/springblade/modules/stock/mapper/StrainService.xml
@@ -26,7 +26,41 @@
<select id="selectStockPage" resultMap="stockResultMap">
- select * from sys_stock where is_deleted = 0
+ select *
+ from sys_stock
+ where is_deleted = 0
+ </select>
+
+ <select id="selectLists" resultType="org.springblade.modules.stock.vo.StockVO">
+ SELECT st.*,
+ stf.agricultural_name AS factoryName,
+ stf.type AS stype,
+ d.dict_value AS dic1,
+ c.dict_value AS dic2
+ FROM sys_stock st
+ LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id
+ LEFT JOIN (SELECT dict_key, dict_value
+ FROM blade_dict_biz
+ WHERE CODE = 'stockSpecs1' AND is_deleted = 0) d ON d.dict_key = st.specs_value1
+ LEFT JOIN (SELECT dict_key, dict_value
+ FROM blade_dict_biz
+ WHERE CODE = 'stockSpecs2' AND is_deleted = 0) c ON c.dict_key = st.specs_value1
+ WHERE st.is_deleted = 0
+ <if test="stock.stype!=null and stock.stype != ''">
+ and stf.type = #{stock.stype}
+ </if>
+ <if test="stock.specsValue1!=null and stock.specsValue1 != ''">
+ and st.specs_value1 = #{stock.specsValue1}
+ </if>
+ <if test="stock.specsValue2!=null and stock.specsValue2 != ''">
+ and st.specs_value2 = #{stock.specsValue2}
+ </if>
+ <if test="stock.state!=null and stock.state != ''">
+ and st.state = #{stock.state}
+ </if>
+ <if test="stock.type!=null and stock.type != ''">
+ and st.type = #{stock.type}
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/stock/service/IStockService.java b/src/main/java/org/springblade/modules/stock/service/IStockService.java
index c5643e0..6210ecd 100644
--- a/src/main/java/org/springblade/modules/stock/service/IStockService.java
+++ b/src/main/java/org/springblade/modules/stock/service/IStockService.java
@@ -37,6 +37,6 @@
* @return
*/
IPage<StockVO> selectStockPage(IPage<StockVO> page, StockVO stock);
- IPage<StockVO> seletList(IPage<StockVO> page, StockVO stock);
+ IPage<StockVO> selectLists(IPage<StockVO> page, StockVO stock);
}
diff --git a/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java b/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java
index 0f8827d..18eacdb 100644
--- a/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java
+++ b/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java
@@ -39,8 +39,8 @@
}
@Override
- public IPage<StockVO> seletList(IPage<StockVO> page, StockVO stock) {
- return page.setRecords(baseMapper.seletList(page,stock));
+ public IPage<StockVO> selectLists(IPage<StockVO> page, StockVO stock) {
+ return page.setRecords(baseMapper.selectLists(page,stock));
}
}
--
Gitblit v1.9.3