From 3bfbba666648bb7e8ddfc7adce655806cc9b688f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 29 Dec 2021 14:45:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/AllMattersResultDTO.java | 6 ++++++
 .../src/main/resources/mapper/IcPartyServiceCenterDao.xml   | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AllMattersResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AllMattersResultDTO.java
index 558e73dfe0..284dec32c8 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AllMattersResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AllMattersResultDTO.java
@@ -34,10 +34,16 @@ public class AllMattersResultDTO implements Serializable {
      */
     private String matterImg;
 
+    private String address;
+
+    private String workPhone;
+
     public AllMattersResultDTO() {
         this.matterName = "";
         this.allowTime = "";
         this.matterId = "";
         this.matterImg = "";
+        this.address = "";
+        this.workPhone = "";
     }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml
index dc979d5df6..6c5db49dff 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml
@@ -61,7 +61,9 @@
                  when cm.APPOINTMENT_TYPE = 'workDay' THEN CONCAT('工作日',' ', cm.START_TIME,'-',cm.END_TIME)
                  when cm.APPOINTMENT_TYPE = 'weekend' THEN CONCAT('周末',' ', cm.START_TIME,'-',cm.END_TIME)
                  ELSE CONCAT(cm.START_TIME,'-',cm.END_TIME) END AS allowTime,
-            IFNULL(cm.MATTER_IMG,'') AS matterImg
+            IFNULL(cm.MATTER_IMG,'') AS matterImg,
+            c.ADDRESS,
+            c.WORK_PHONE
         FROM ic_party_service_center c
         INNER JOIN ic_party_service_center_matter cm ON (cm.PARTY_SERVICE_CENTER_ID = c.ID AND cm.DEL_FLAG = 0)
             AND c.DEL_FLAG = 0