From 12407567ca8a5008e18125bd0adb84b5af836de6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 16:17:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/result/ActAndScheduleListResultDTO.java | 1 + .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) 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,