From 439126dc5133dcb6b689d3942682c2fd26780631 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Sat, 14 Sep 2024 10:31:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9D=A2=E7=A7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/resi/partymember/dto/ScreenEnterpriseOutputDTO.java | 2 ++
 .../dto/partymember/result/AegetableResultDTO.java            | 2 +-
 .../partymember/entity/ScreenEnterpriseOutputEntity.java      | 2 ++
 .../mapper/partymember/ScreenEnterpriseOutputDao.xml          | 4 +++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ScreenEnterpriseOutputDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ScreenEnterpriseOutputDTO.java
index 7d3616f588..0d3f32ec5d 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ScreenEnterpriseOutputDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ScreenEnterpriseOutputDTO.java
@@ -93,4 +93,6 @@ public class ScreenEnterpriseOutputDTO implements Serializable {
      */
 	private Date marketTime;
 
+    private String area;
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AegetableResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AegetableResultDTO.java
index e8b369bb88..858d5cc98a 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AegetableResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AegetableResultDTO.java
@@ -34,7 +34,7 @@ public class AegetableResultDTO implements Serializable {
 
         private Date marketTime;
 
-
+        private String area;
 
     }
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/ScreenEnterpriseOutputEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/ScreenEnterpriseOutputEntity.java
index fa20e1998f..4a1a13cd6e 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/ScreenEnterpriseOutputEntity.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/ScreenEnterpriseOutputEntity.java
@@ -63,4 +63,6 @@ public class ScreenEnterpriseOutputEntity extends BaseEpmetEntity {
      */
 	private Date marketTime;
 
+	private String area;
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/ScreenEnterpriseOutputDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/ScreenEnterpriseOutputDao.xml
index 2be2ba5dc0..9a677a8ef6 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/ScreenEnterpriseOutputDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/ScreenEnterpriseOutputDao.xml
@@ -38,6 +38,7 @@
         <collection property="detailList" ofType="com.epmet.resi.partymember.dto.partymember.result.AegetableResultDTO$AegetableResultClildDTO">
             <result property="placeOrgName" column="PLACE_ORG_NAME"/>
             <result property="output" column="OUTPUT"/>
+            <result property="area" column="AREA"/>
             <result property="growTime" column="GROW_TIME"/>
             <result property="marketTime" column="MARKET_TIME"/>
         </collection>
@@ -49,7 +50,8 @@
             o2.PLACE_ORG_NAME,
             o2.GROW_TIME,
             o2.MARKET_TIME,
-            o2.OUTPUT
+            o2.OUTPUT,
+            o2.AREA
         FROM
             screen_enterprise_output o1
             LEFT JOIN screen_enterprise_output o2 ON o1.VEGETABLE_CATEGORY = o2.VEGETABLE_CATEGORY