From a82c13469f11f5f11cc999950b7838a7c7b58ce7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 7 Jan 2022 13:39:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=AF=8F=E5=A4=A9=EF=BC=9AeveryDay=EF=BC=8C=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=EF=BC=9AworkDay=EF=BC=8C=E5=91=A8=E6=9C=AB=EF=BC=9Awe?=
 =?UTF-8?q?ekend?=
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   | 3 ++-
 2 files changed, 8 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 cdd4d8d7d6..f229cc1d37 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
@@ -47,6 +47,11 @@ public class AllMattersResultDTO implements Serializable {
     @JsonIgnore
     private String endTime;
 
+    /**
+     * 预约类型，每天：everyDay，工作日：workDay，周末：weekend
+     */
+    private String appointmentType;
+
     public AllMattersResultDTO() {
         this.matterName = "";
         this.allowTime = "";
@@ -55,5 +60,6 @@ public class AllMattersResultDTO implements Serializable {
         this.address = "";
         this.workPhone = "";
         this.centerName = "";
+        this.appointmentType="";
     }
 }
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 97f5e43cbf..f159698f7f 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
@@ -64,7 +64,8 @@
             IFNULL(cm.MATTER_IMG,'') AS matterImg,
             c.ADDRESS,
             c.WORK_PHONE,
-            c.CENTER_NAME
+            c.CENTER_NAME,
+            cm.APPOINTMENT_TYPE as appointmentType
         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