From df0fc1462cd0c7619fc3234bad5947a2613dae75 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 21 Jul 2022 08:37:03 +0800
Subject: [PATCH] 增加品种名，地区给VO
---
src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java | 4 ++++
src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml | 10 ++++++----
src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml | 15 +++++++++++++--
src/main/java/org/springblade/modules/retrieval/vo/RetrievalVO.java | 8 ++++++++
4 files changed, 31 insertions(+), 6 deletions(-)
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 2efadae..f3b7355 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
+++ b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
@@ -3,15 +3,17 @@
<mapper namespace="org.springblade.modules.InventoryLoss.mapper.InventoryMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="inventoryResultMap" type="org.springblade.modules.InventoryLoss.entity.Inventory">
+ <resultMap id="inventoryResultMap" type="org.springblade.modules.InventoryLoss.vo.InventoryVO">
<result column="id" property="id"/>
-
+ <result column="strain_name" property="strainName"/>
</resultMap>
<select id="selectSalePage" resultMap="inventoryResultMap">
- select *
- from sys_inventory
+ select inventory.*,
+ strain.strain_name
+ from sys_inventory inventory
+ LEFT JOIN sys_strain strain on inventory.strain_id = strain.id
where is_deleted = 0
</select>
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java b/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
index ffe1957..66394c7 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
+++ b/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
@@ -34,4 +34,8 @@
* 库存量主键id
*/
private String proid;
+ /**
+ * 品种名
+ */
+ private String strainName;
}
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 5680d25..d9e0a7d 100644
--- a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
+++ b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
@@ -3,8 +3,10 @@
<mapper namespace="org.springblade.modules.retrieval.mapper.RetrievalMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="retrievalResultMap" type="org.springblade.modules.retrieval.entity.Retrieval">
+ <resultMap id="retrievalResultMap" type="org.springblade.modules.retrieval.vo.RetrievalVO">
<result column="id" property="id"/>
+ <result column="strain_name" property="strainName"/>
+ <result column="district" property="district"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
<result column="create_time" property="createTime"/>
@@ -25,7 +27,16 @@
<select id="selectRetrievalPage" resultMap="retrievalResultMap">
- select * from sys_retrieval where is_deleted = 0
+ SELECT
+ retrieval.*,
+ strain.strain_name,
+ district.name as district
+ 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
+ WHERE
+ is_deleted = 0
</select>
</mapper>
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 cea067c..7935a77 100644
--- a/src/main/java/org/springblade/modules/retrieval/vo/RetrievalVO.java
+++ b/src/main/java/org/springblade/modules/retrieval/vo/RetrievalVO.java
@@ -34,4 +34,12 @@
* 库存量主键id
*/
private String proid;
+ /**
+ * 品种名
+ */
+ private String strainName;
+ /**
+ * 出库去向
+ */
+ private String district;
}
--
Gitblit v1.9.3