From 511f1813c5c9c4b49ab9fd71adbcd2cea50aa268 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 2 Sep 2022 15:33:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/partymember/dto/IcScheduleDTO.java   |  8 ++++++-
 .../form/AddOrEditScheduleFormDTO.java        |  3 +++
 .../partyOrg/entity/IcScheduleEntity.java     |  5 ++++
 .../db/migration/V0.0.9__schedule_time.sql    |  1 +
 .../mapper/partyOrg/IcScheduleDao.xml         | 24 ++++++++++---------
 5 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.9__schedule_time.sql

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}
             <if test='null != dateId and dateId != "" '>
-                AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') = #{dateId}
+                AND DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') = #{dateId}
             </if>
             <if test='null != startDate and startDate != ""'>
-                AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') >= #{startDate}
+                AND DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') >= #{startDate}
             </if>
             <if test='null != endDate and endDate != ""'>
-                AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endDate}
+                AND DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endDate}
             </if>
             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
     </select>
 
     <select id="selectScheduleList" resultType="com.epmet.resi.partymember.dto.partyOrg.result.IcScheduleListDTO">
@@ -76,6 +77,7 @@
             staff_id,
             title,
             remind_time,
+            happened_time,
             DATE_FORMAT(remind_time,'%Y-%m-%d %H:%i:%s')remindTimeName,
             is_public,
             IF (is_public = '0', '仅自己可见', '组织内其他人可见') "isPublicName",
@@ -91,10 +93,10 @@
             AND title like concat('%', #{title}, '%')
         </if>
         <if test='null != startTime and startTime != ""'>
-            AND DATE_FORMAT(remind_time,'%Y%m%d') >= #{startTime}
+            AND DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') >= #{startTime}
         </if>
         <if test='null != endTime and endTime != ""'>
-            AND DATE_FORMAT(remind_time,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
+            AND DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
         </if>
         <choose>
             <when test='isPublic == "0"'>
@@ -107,7 +109,7 @@
                 AND (is_public = '1' OR (staff_id = #{staffId} AND is_public = '0'))
             </otherwise>
         </choose>
-        order by remind_time desc
+        order by HAPPENED_TIME desc
     </select>