diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/MatterListDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/MatterListDTO.java index 21c56927e2..95c545f656 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/MatterListDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/MatterListDTO.java @@ -32,6 +32,12 @@ public class MatterListDTO implements Serializable { */ private String allowTime; + private String startTime; + + private String endTime; + + private String appointmentType; + public MatterListDTO() { this.sort = NumConstant.ZERO; this.matterName = ""; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PartyServiceCenterListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PartyServiceCenterListResultDTO.java index 7f99cedc12..17ca6f112c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PartyServiceCenterListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PartyServiceCenterListResultDTO.java @@ -46,6 +46,10 @@ public class PartyServiceCenterListResultDTO implements Serializable { * 下午工作时间 */ private String pmWorkTime; + private String amStartTime; + private String amEndTime; + private String pmStartTime; + private String pmEndTime; /** * 经度 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 db25c15da0..9ce747f95f 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 @@ -8,14 +8,19 @@ - - + + + + + + + @@ -25,13 +30,17 @@ sc.CENTER_NAME AS centerName, sc.ADDRESS AS address, sc.WORK_PHONE AS workPhone, - CONCAT('上午 ',sc.AM_START_TIME,' ~ ',sc.AM_END_TIME) AS amWorkTime, - CONCAT('下午 ',sc.PM_START_TIME,' ~ ',sc.PM_END_TIME) AS pmWorkTime, + sc.AM_START_TIME AS amStartTime, + sc.AM_END_TIME AS amEndTime, + sc.PM_START_TIME AS pmStartTime, + sc.PM_END_TIME AS pmEndTime, sc.LONGITUDE AS longitude, sc.LATITUDE AS latitude, cm.MATTER_NAME AS matterName, cm.ID AS matterId, - CONCAT(cm.START_TIME,' ~ ',cm.END_TIME) AS allowTime + cm.START_TIME AS startTime, + cm.END_TIME AS endTime, + cm.APPOINTMENT_TYPE AS appointmentType FROM ic_party_service_center sc LEFT JOIN ic_party_service_center_matter cm ON (cm.PARTY_SERVICE_CENTER_ID = sc.ID AND cm.DEL_FLAG = 0) WHERE sc.DEL_FLAG = 0