From 1675a001df5eca33401e21cb6ece679160ae8976 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 Aug 2022 11:14:42 +0800
Subject: [PATCH] 出库方向配置数据字典
---
src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml | 44 +++++++++++++++------
src/main/java/org/springblade/modules/retrieval/vo/RetrievalVO.java | 4 ++
src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java | 20 +++++-----
3 files changed, 45 insertions(+), 23 deletions(-)
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 6d8ebe0..10be15e 100644
--- a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
+++ b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
@@ -29,26 +29,44 @@
<select id="selectRetrievalPage" resultMap="retrievalResultMap">
+<!-- SELECT-->
+<!-- retrieval.*,-->
+<!-- strain.strain_name,-->
+<!-- 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-->
+<!-- LEFT JOIN sys_land land ON land.id = retrieval.land_id-->
+<!-- WHERE-->
+<!-- <if test="retrieval.strainId !=null and retrieval.strainId != '' ">-->
+<!-- retrieval.strain_id = #{retrieval.strainId} AND-->
+<!-- </if>-->
+<!-- <if test="retrieval.farmId != null and retrieval.farmId !=''">-->
+<!-- land.farm_id = #{retrieval.farmId} AND-->
+<!-- </if>-->
+<!-- retrieval.is_deleted = 0 ORDER BY retrieval.create_time DESC-->
SELECT
- retrieval.*,
- strain.strain_name,
- district.name as district,
- region.city_name,
- region.district_name
+ retrieval.*,
+ strain.strain_name,
+ bdb.dict_value AS reDestination
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
- LEFT JOIN sys_land land ON land.id = retrieval.land_id
+ sys_retrieval retrieval
+ LEFT JOIN sys_strain strain ON strain.id = retrieval.strain_id
+ LEFT JOIN blade_dict_biz bdb ON bdb.dict_key = retrieval.sale_destination1
+ LEFT JOIN sys_land land ON land.id = retrieval.land_id
WHERE
+ bdb.code = "reDestination"
<if test="retrieval.strainId !=null and retrieval.strainId != '' ">
- retrieval.strain_id = #{retrieval.strainId} AND
+ AND retrieval.strain_id = #{retrieval.strainId}
</if>
<if test="retrieval.farmId != null and retrieval.farmId !=''">
- land.farm_id = #{retrieval.farmId} AND
+ AND land.farm_id = #{retrieval.farmId}
</if>
- retrieval.is_deleted = 0 ORDER BY retrieval.create_time DESC
+ AND retrieval.is_deleted = 0 ORDER BY retrieval.create_time DESC
</select>
</mapper>
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 901cd47..d110a98 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
@@ -39,16 +39,16 @@
@Override
public IPage<RetrievalVO> selectRetrievalPage(IPage<RetrievalVO> page, RetrievalVO retrieval) {
List<RetrievalVO> retrievalVO = baseMapper.selectRetrievalPage(page, retrieval);
- retrievalVO.forEach(new Consumer<RetrievalVO>() {
- @Override
- public void accept(RetrievalVO retrievalVO) {
- if (retrievalVO.getCityName() != null) {
- retrievalVO.setSaleDestination2(retrievalVO.getDistrict() + retrievalVO.getCityName() + retrievalVO.getCountyName());
- }else {
- retrievalVO.setSaleDestination2(retrievalVO.getDistrict());
- }
- }
- });
+// retrievalVO.forEach(new Consumer<RetrievalVO>() {
+// @Override
+// public void accept(RetrievalVO retrievalVO) {
+// if (retrievalVO.getCityName() != null) {
+// retrievalVO.setSaleDestination2(retrievalVO.getDistrict() + retrievalVO.getCityName() + retrievalVO.getCountyName());
+// }else {
+// retrievalVO.setSaleDestination2(retrievalVO.getDistrict());
+// }
+// }
+// });
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 66465c0..7e1181d 100644
--- a/src/main/java/org/springblade/modules/retrieval/vo/RetrievalVO.java
+++ b/src/main/java/org/springblade/modules/retrieval/vo/RetrievalVO.java
@@ -55,6 +55,10 @@
*/
private String saleDestination2;
/**
+ * 具体销售去向中文
+ */
+ private String reDestination;
+ /**
* 农场id
*/
private String farmId;
--
Gitblit v1.9.3