diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java index 218c29a284..bc320d7a8c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -61,6 +61,7 @@ public class ActAndScheduleListResultDTO implements Serializable { private String scheduleId; private String title; private String remindTime; + private String happenedTime; private String remark; private Boolean isMe = false; private String staffId; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index b51ff2acb1..c33134f176 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -49,7 +49,7 @@ ID AS scheduleId, TITLE, DATE_FORMAT(REMIND_TIME,'%Y-%m-%d %H:%i:%s') AS remindTime, - DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s') AS happenedTime, + DATE_FORMAT(happened_time,'%Y-%m-%d') AS happenedTime, DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') AS dateId, REMARK, STAFF_ID @@ -78,7 +78,7 @@ title, remind_time, DATE_FORMAT(remind_time,'%Y-%m-%d %H:%i:%s')remindTimeName, - DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s')happenedTime, + DATE_FORMAT(happened_time,'%Y-%m-%d')happenedTime, is_public, IF (is_public = '0', '仅自己可见', '组织内其他人可见') "isPublicName", remark,