From aa58f5468671346a34da061f5a6ebb94ffa43e05 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 29 Nov 2022 09:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/AllMattersResultDTO.java  | 5 +++++
 .../com/epmet/dto/result/AppointmentRecordResultDTO.java     | 5 +++++
 .../main/resources/mapper/IcMatterAppointmentRecordDao.xml   | 3 ++-
 .../src/main/resources/mapper/IcPartyServiceCenterDao.xml    | 4 +++-
 4 files changed, 15 insertions(+), 2 deletions(-)

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 f229cc1d37..a1eea7289d 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
@@ -52,6 +52,11 @@ public class AllMattersResultDTO implements Serializable {
      */
     private String appointmentType;
 
+    /**
+     * 类型为自定义时选择的周一~周末的时间（1-7逗号分割）
+     */
+    private String customDay;
+
     public AllMattersResultDTO() {
         this.matterName = "";
         this.allowTime = "";
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java
index f7189534a4..373bff906c 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java
@@ -45,6 +45,11 @@ public class AppointmentRecordResultDTO implements Serializable {
      */
     private String matterImg;
 
+    /**
+     * 类型为自定义时选择的周一~周末的时间（1-7逗号分割）
+     */
+    private String customDay;
+
     /**
      * 是否能取消预约 true：能，false：不能
      */
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
index 8f1677d3ed..240d8e0b97 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
@@ -63,7 +63,8 @@
             ar.MATTER_ID as matterId,
             c.CENTER_NAME,
             c.ADDRESS,
-            cm.MATTER_IMG
+            cm.MATTER_IMG,
+            cm.CUSTOM_DAY as customDay
         FROM ic_matter_appointment_record ar
         LEFT JOIN ic_party_service_center_matter cm ON (cm.ID = ar.MATTER_ID AND cm.DEL_FLAG = 0)
         LEFT JOIN ic_party_service_center c ON (c.ID = cm.PARTY_SERVICE_CENTER_ID AND c.DEL_FLAG = 0)
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 18983d6244..daad3eb3e3 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
@@ -62,12 +62,14 @@
             case when cm.APPOINTMENT_TYPE = 'everyDay' THEN CONCAT('每天',' ', cm.START_TIME,'-',cm.END_TIME)
                  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)
+                 when cm.APPOINTMENT_TYPE = 'custom' 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,
             c.ADDRESS,
             c.WORK_PHONE,
             c.CENTER_NAME,
-            cm.APPOINTMENT_TYPE as appointmentType
+            cm.APPOINTMENT_TYPE as appointmentType,
+            cm.CUSTOM_DAY as customDay
         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