Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java

@@ -40,10 +40,29 @@ public class AppointmentRecordResultDTO implements Serializable {
      */
     private String remark;
 
+    /**
+     * 事项图片
+     */
+    private String matterImg;
+
+    /**
+     * 是否能取消预约 true：能，false：不能
+     */
     private Boolean isCancel;
 
+    /**
+     * 记录ID
+     */
     private String recordId;
+
+    /**
+     * 可预约事项所属中心名字
+     */
     private String centerName;
+
+    /**
+     * 可预约事项所属中心地址
+     */
     private String address;
 
     /**
@@ -51,6 +70,9 @@ public class AppointmentRecordResultDTO implements Serializable {
      */
     private List<String> appointmentTime;
 
+    /**
+     * 预约日期
+     */
     private String appointmentDate;
 
     @JsonIgnore
@@ -68,5 +90,6 @@ public class AppointmentRecordResultDTO implements Serializable {
         this.recordId = "";
         this.appointmentDate = "";
         this.isCancel = true;
+        this.matterImg = "";
     }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml

@@ -23,7 +23,8 @@
             ar.TIME_ID,
             cm.MATTER_NAME,
             ar.ID AS recordId,
-            ar.matter_id as matterId
+            ar.matter_id as matterId,
+            cm.MATTER_IMG
         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)
         WHERE ar.DEL_FLAG = 0
@@ -61,7 +62,8 @@
             ar.APPOINTMENT_DATE,
             ar.MATTER_ID as matterId,
             c.CENTER_NAME,
-            c.ADDRESS
+            c.ADDRESS,
+            cm.MATTER_IMG
         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)