From e8bcd72851448984a48cc11b003658db3b7a3c58 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 18:06:54 +0800
Subject: [PATCH] 更新地区三级显示
---
src/main/java/org/springblade/modules/sale/vo/SaleVO.java | 12 ++++++
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java | 2
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 10 ++++
src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java | 11 +++++
src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml | 6 ++
src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.java | 5 +-
src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml | 10 ++++
src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.java | 3 +
src/main/java/org/springblade/modules/retrieval/vo/RetrievalVO.java | 12 ++++++
src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java | 12 +++++
10 files changed, 74 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.java b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.java
index aac93d8..03ee5a8 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.java
+++ b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.InventoryLoss.entity.Inventory;
import org.springblade.modules.InventoryLoss.vo.InventoryVO;
@@ -35,8 +36,8 @@
* 自定义分页
*
* @param page
- * @param lnventory
+ * @param inventory
* @return
*/
- List<InventoryVO> selectSalePage(IPage page, InventoryVO lnventory);
+ List<InventoryVO> selectSalePage(IPage page, @Param("inventory") InventoryVO inventory);
}
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
index f3b7355..39d5176 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
+++ b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
@@ -14,7 +14,11 @@
strain.strain_name
from sys_inventory inventory
LEFT JOIN sys_strain strain on inventory.strain_id = strain.id
- where is_deleted = 0
+ where
+ <if test="inventory.strainId !=null and inventory.strainId != '' ">
+ inventory.strain_id = #{inventory.strainId} AND
+ </if>
+ is_deleted = 0
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.java b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.java
index b6ac9e9..ef543ca 100644
--- a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.java
+++ b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.retrieval.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.retrieval.entity.Retrieval;
import org.springblade.modules.retrieval.vo.RetrievalVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,6 +38,6 @@
* @param retrieval
* @return
*/
- List<RetrievalVO> selectRetrievalPage(IPage page, RetrievalVO retrieval);
+ List<RetrievalVO> selectRetrievalPage(IPage page, @Param("retrieval") RetrievalVO retrieval);
}
diff --git a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
index d9e0a7d..93efdd2 100644
--- a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
+++ b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
@@ -23,6 +23,8 @@
<result column="city" property="city"/>
<result column="county" property="county"/>
<result column="land_id" property="landId"/>
+ <result column="city_name" property="cityName"/>
+ <result column="district_name" property="countyName"/>
</resultMap>
@@ -30,12 +32,18 @@
SELECT
retrieval.*,
strain.strain_name,
- district.name as district
+ district.name as district,
+ region.city_name,
+ region.district_name
FROM
sys_retrieval retrieval
LEFT JOIN sys_strain strain ON strain.id = retrieval.strain_id
LEFT JOIN sys_district district ON retrieval.sale_destination = district.code
+ LEFT JOIN blade_region region on retrieval.county = region.district_code
WHERE
+ <if test="retrieval.strainId !=null and retrieval.strainId != '' ">
+ retrieval.strain_id = #{retrieval.strainId} AND
+ </if>
is_deleted = 0
</select>
diff --git a/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java b/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java
index 5c0f1dd..06e117d 100644
--- a/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java
@@ -24,6 +24,9 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+import java.util.function.Consumer;
+
/**
* 库存出库记录表 服务实现类
*
@@ -35,7 +38,14 @@
@Override
public IPage<RetrievalVO> selectRetrievalPage(IPage<RetrievalVO> page, RetrievalVO retrieval) {
- return page.setRecords(baseMapper.selectRetrievalPage(page, retrieval));
+ List<RetrievalVO> retrievalVO = baseMapper.selectRetrievalPage(page, retrieval);
+ retrievalVO.forEach(new Consumer<RetrievalVO>() {
+ @Override
+ public void accept(RetrievalVO retrievalVO) {
+ retrievalVO.setSaleDestination2(retrievalVO.getDistrict()+retrievalVO.getCityName()+retrievalVO.getCountyName());
+ }
+ });
+ return page.setRecords(retrievalVO);
}
}
diff --git a/src/main/java/org/springblade/modules/retrieval/vo/RetrievalVO.java b/src/main/java/org/springblade/modules/retrieval/vo/RetrievalVO.java
index 7935a77..4bce53b 100644
--- a/src/main/java/org/springblade/modules/retrieval/vo/RetrievalVO.java
+++ b/src/main/java/org/springblade/modules/retrieval/vo/RetrievalVO.java
@@ -42,4 +42,16 @@
* 出库去向
*/
private String district;
+ /**
+ * 销售地市中文
+ */
+ private String cityName;
+ /**
+ * 销售地区中文
+ */
+ private String countyName;
+ /**
+ * 省市区中文拼接
+ */
+ private String saleDestination2;
}
diff --git a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
index 047ed48..52966d1 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
@@ -39,7 +39,7 @@
* @param sale
* @return
*/
- List<SaleVO> selectSalePage(IPage page, SaleVO sale);
+ List<SaleVO> selectSalePage(IPage page, @Param("sale") SaleVO sale);
Map<String, String> selctSaletCount(String farmId);
List<Map<Object,String>> selctSaletZ(@Param("sale") SaleVO sale);
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 4a0bd48..11691b3 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -23,6 +23,8 @@
<result column="url" property="url"/>
<result column="district" property="district"/>
<result column="land_id" property="landId"/>
+ <result column="city_name" property="cityName"/>
+ <result column="district_name" property="countyName"/>
</resultMap>
@@ -32,13 +34,19 @@
user.real_name,
strain.strain_name,
strain.url,
- district.name as district
+ district.name as district,
+ region.city_name,
+ region.district_name
FROM
sys_sale sale
LEFT JOIN blade_user user on sale.create_user = user.id
LEFT JOIN sys_strain strain on sale.strain_id = strain.id
LEFT JOIN sys_district district on sale.sale_destination = district.code
+ LEFT JOIN blade_region region on sale.county = region.district_code
WHERE
+ <if test="sale.strainId !=null and sale.strainId != '' ">
+ sale.strain_id = #{sale.strainId} AND
+ </if>
sale.is_deleted = 0
</select>
diff --git a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
index aaf214f..2e52e92 100644
--- a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
@@ -26,6 +26,7 @@
import java.util.List;
import java.util.Map;
+import java.util.function.Consumer;
/**
* 销售记录表 服务实现类
@@ -38,7 +39,15 @@
@Override
public IPage<SaleVO> selectSalePage(IPage<SaleVO> page, SaleVO sale) {
- return page.setRecords(baseMapper.selectSalePage(page, sale));
+
+ List<SaleVO> saleVO = baseMapper.selectSalePage(page, sale);
+ saleVO.forEach(new Consumer<SaleVO>() {
+ @Override
+ public void accept(SaleVO saleVO) {
+ saleVO.setSaleDestination2(saleVO.getDistrict()+saleVO.getCityName()+saleVO.getCountyName());
+ }
+ });
+ return page.setRecords(saleVO);
}
@Override
diff --git a/src/main/java/org/springblade/modules/sale/vo/SaleVO.java b/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
index 8e0687f..a45f41e 100644
--- a/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
+++ b/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
@@ -48,6 +48,18 @@
*/
private String district;
/**
+ * 销售地市中文
+ */
+ private String cityName;
+ /**
+ * 销售地区中文
+ */
+ private String countyName;
+ /**
+ * 省市区中文拼接
+ */
+ private String saleDestination2;
+ /**
* 地块名称
*/
private String landName;
--
Gitblit v1.9.3