diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java
index bf27e821bd..c96a47b194 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java
@@ -1,8 +1,9 @@
package com.epmet.resi.partymember.dto;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Date;
-import lombok.Data;
/**
@@ -56,6 +57,11 @@ public class IcScheduleDTO implements Serializable {
*/
private Date remindTime;
+ /**
+ * 发生时间
+ */
+ private Date happenedTime;
+
/**
* 是否公开,0:仅自己可见;1:组织内其他人可见
*/
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java
index 5daa0a7aca..c1e50df6c7 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java
@@ -41,6 +41,9 @@ public class AddOrEditScheduleFormDTO implements Serializable {
@NotBlank(message = "isPublic不能为空",groups = AddScheduleForm.class)
private String isPublic;
+ @NotNull(message = "happenedTime不能为空",groups = AddScheduleForm.class)
+ private Date happenedTime;
+
/**
* 备注(500字)
*/
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java
index 9fe4024d82..9f3191a33f 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java
@@ -56,6 +56,11 @@ public class IcScheduleEntity extends BaseEpmetEntity {
*/
private Date remindTime;
+ /**
+ * 发生时间
+ */
+ private Date happenedTime;
+
/**
* 是否公开,0:仅自己可见;1:组织内其他人可见
*/
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.9__schedule_time.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.9__schedule_time.sql
new file mode 100644
index 0000000000..9a9cb3f6b3
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.9__schedule_time.sql
@@ -0,0 +1 @@
+ALTER TABLE ic_schedule ADD COLUMN HAPPENED_TIME datetime not null COMMENT '发生时间' AFTER REMIND_TIME;
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 cb56d450fb..eb00869c58 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
@@ -21,14 +21,14 @@
FROM
(SELECT
COUNT(id) as count,
- DATE_FORMAT(CREATED_TIME,'%Y%m') as monthId
+ DATE_FORMAT(HAPPENED_TIME,'%Y%m') as monthId
FROM ic_schedule
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
- AND DATE_FORMAT(REMIND_TIME,'%Y') = #{yearId}
+ AND DATE_FORMAT(HAPPENED_TIME,'%Y') = #{yearId}
AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%')
AND (IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0'))
- GROUP BY DATE_FORMAT(REMIND_TIME,'%Y%m')
+ GROUP BY DATE_FORMAT(HAPPENED_TIME,'%Y%m')
UNION ALL
SELECT
COUNT(id) as count,
@@ -49,24 +49,25 @@
ID AS scheduleId,
TITLE,
DATE_FORMAT(REMIND_TIME,'%Y-%m-%d %H:%i:%s') AS remindTime,
- DATE_FORMAT(REMIND_TIME,'%Y%m%d') AS dateId,
+ DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s') AS happenedTime,
+ DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') AS dateId,
REMARK,
STAFF_ID
FROM ic_schedule
WHERE DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
- AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') = #{dateId}
+ AND DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') = #{dateId}
- AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') >= #{startDate}
+ AND DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') >= #{startDate}
- AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') #{endDate}
+ AND DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') #{endDate}
AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%')
AND (IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0'))
- order by REMIND_TIME desc
+ order by HAPPENED_TIME desc