heart-work:暂存

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java

@@ -0,0 +1,109 @@
+package com.epmet.dto.result.work;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 已结束-活动详情
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/7/26 20:52
+ */
+@Data
+public class FinishedActDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = 6780614493878658227L;
+    /**
+     * 活动id
+     */
+    private String actId;
+
+    /**
+     * 活动标题
+     */
+    private String title;
+
+    /**
+     * 报名截止时间：yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date signUpEndTime;
+
+    /**
+     * 活动预计开始时间yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date actStartTime;
+
+    /**
+     * 活动预计结束时间yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date actEndTime;
+
+    /**
+     * 活动地点
+     */
+    private String actAddress;
+
+    /**
+     * 活动名额
+     */
+    private Integer actQuota;
+
+    /**
+     * true:固定名额  false： 不限制名额
+     */
+    private Boolean actQuotaCategory;
+
+    /**
+     * 联系人
+     */
+    private String sponsorContacts;
+
+    /**
+     * 联系电话
+     */
+    private String sponsorTel;
+
+    /**
+     * 活动积分
+     */
+    private Integer reward;
+
+    /**
+     * 主办方名称
+     */
+    private String sponsorName;
+
+    /**
+     * 报名条件
+     */
+    private String requirement;
+
+    /**
+     * 是否添加回顾：true已经总结 false:未总结
+     */
+    private Boolean summaryFlag;
+
+    /**
+     * 活动详情
+     */
+    private List<ActPreviewContentResultDTO> actContent;
+
+    /**
+     * 实际开始时间yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date actualStartTime;
+
+    /**
+     * 实际结束时间yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date actualEndTime;
+
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java

@@ -0,0 +1,92 @@
+package com.epmet.dto.result.work;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 进行中-活动详情
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/7/26 21:26
+ */
+@Data
+public class InProgressActDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -2159602705968655263L;
+
+    /**
+     * 活动id
+     */
+    private String actId;
+
+    /**
+     * 活动标题
+     */
+    private String title;
+
+    /**
+     * 报名截止时间：yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date signUpEndTime;
+
+    /**
+     * 活动预计开始时间yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date actStartTime;
+
+    /**
+     * 活动预计结束时间yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date actEndTime;
+
+    /**
+     * 活动地点
+     */
+    private String actAddress;
+
+    /**
+     * 活动名额
+     */
+    private Integer actQuota;
+
+    /**
+     * true:固定名额  false： 不限制名额
+     */
+    private Boolean actQuotaCategory;
+
+    /**
+     * 联系人
+     */
+    private String sponsorContacts;
+
+    /**
+     * 联系电话
+     */
+    private String sponsorTel;
+
+    /**
+     * 活动积分
+     */
+    private Integer reward;
+
+    /**
+     * 主办方名称
+     */
+    private String sponsorName;
+
+    /**
+     * 报名条件
+     */
+    private String requirement;
+
+    /**
+     * 活动详情
+     */
+    private List<ActPreviewContentResultDTO> actContent;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java

@@ -64,8 +64,17 @@ public class InProgressActResultDTO implements Serializable {
      */
     private Integer signedUp;
 
+    /**
+     * 报名截止时间
+     */
     @JsonIgnore
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date signUpEndTime;
+
+    /**
+     * 报名开始时间
+     */
     @JsonIgnore
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date signUpStartTime;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java

@@ -150,4 +150,30 @@ public class WorkActController {
         workActService.saveActualTime(formDTO);
         return new Result();
     }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.work.FinishedActDetailResultDTO>
+     * @author yinzuomei
+     * @description 已结束-活动详情
+     * @Date 2020/7/26 21:01
+     **/
+    @PostMapping("finisheddeatil")
+    public Result<FinishedActDetailResultDTO> finishedDeatil(@RequestBody ActIdFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
+        return new Result<FinishedActDetailResultDTO>().ok(workActService.finishedDeatil(formDTO));
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.work.InProgressActDetailResultDTO>
+     * @author yinzuomei
+     * @description 进行中-活动详情
+     * @Date 2020/7/26 21:33
+     **/
+    @PostMapping("inprogressdetail")
+    public Result<InProgressActDetailResultDTO> inProgressDetail(@RequestBody ActIdFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
+        return new Result<InProgressActDetailResultDTO>().ok(workActService.inProgressDetail(formDTO.getActId()));
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java

@@ -279,4 +279,22 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
      * @Date 2020/7/26 18:29
      **/
     CanceledActDetailResultDTO selectCanceledActInfo(String actId);
+
+    /**
+     * @return com.epmet.dto.result.work.FinishedActDetailResultDTO
+     * @param actId
+     * @author yinzuomei
+     * @description 已结束-活动详情
+     * @Date 2020/7/26 21:04
+     **/
+    FinishedActDetailResultDTO selectFinishedDetail(String actId);
+
+    /**
+     * @return com.epmet.dto.result.work.InProgressActDetailResultDTO
+     * @param actId
+     * @author yinzuomei
+     * @description 进行中-活动详情
+     * @Date 2020/7/26 21:35
+     **/
+    InProgressActDetailResultDTO selectInProgressDetail(String actId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java

@@ -1,9 +1,6 @@
 package com.epmet.service;
 
-import com.epmet.dto.form.work.ActListCommonFormDTO;
+import com.epmet.dto.form.work.*;
-import com.epmet.dto.form.work.CancelActFormDTO;
-import com.epmet.dto.form.work.PublishActInfoFormDTO;
-import com.epmet.dto.form.work.SaveActualTimeFormDTO;
 import com.epmet.dto.result.work.*;
 
 import java.util.List;
@@ -95,4 +92,22 @@ public interface WorkActService {
      * @Date 2020/7/26 19:49
      **/
     void saveActualTime(SaveActualTimeFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.dto.result.work.FinishedActDetailResultDTO
+     * @author yinzuomei
+     * @description 已结束-活动详情
+     * @Date 2020/7/26 21:02
+     **/
+    FinishedActDetailResultDTO finishedDeatil(ActIdFormDTO formDTO);
+
+    /**
+     * @return com.epmet.dto.result.work.InProgressActDetailResultDTO
+     * @param actId
+     * @author yinzuomei
+     * @description 进行中-活动详情
+     * @Date 2020/7/26 21:34
+     **/
+    InProgressActDetailResultDTO inProgressDetail(String actId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -579,4 +579,38 @@ public class WorkActServiceImpl implements WorkActService {
         actInfoDTO.setServiceMin(DateUtils.calculateMin(actualStartTime,actualEndTime));
         actInfoService.update(actInfoDTO);
     }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.dto.result.work.FinishedActDetailResultDTO
+     * @author yinzuomei
+     * @description 已结束-活动详情
+     * @Date 2020/7/26 21:02
+     **/
+    @Override
+    public FinishedActDetailResultDTO finishedDeatil(ActIdFormDTO formDTO) {
+        FinishedActDetailResultDTO resultDTO = actInfoDao.selectFinishedDetail(formDTO.getActId());
+        if (null != resultDTO) {
+            List<ActPreviewContentResultDTO> list = actContentDao.selectByActId(formDTO.getActId());
+            resultDTO.setActContent(list);
+        }
+        return resultDTO;
+    }
+
+    /**
+     * @param actId
+     * @return com.epmet.dto.result.work.InProgressActDetailResultDTO
+     * @author yinzuomei
+     * @description 进行中-活动详情
+     * @Date 2020/7/26 21:34
+     **/
+    @Override
+    public InProgressActDetailResultDTO inProgressDetail(String actId) {
+        InProgressActDetailResultDTO resultDTO = actInfoDao.selectInProgressDetail(actId);
+        if (null != resultDTO) {
+            List<ActPreviewContentResultDTO> list = actContentDao.selectByActId(actId);
+            resultDTO.setActContent(list);
+        }
+        return resultDTO;
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@@ -506,7 +506,7 @@
             AND ai.ACT_STATUS = 'canceled'
             AND ai.CUSTOMER_ID = #{customerId}
         ORDER BY
-            ai.CANCEL_TIME DESC
+            ai.CREATED_TIME DESC
     </select>
 
     <!-- 已结束-活动列表 -->
@@ -526,7 +526,7 @@
             AND ai.ACT_STATUS = 'finished'
             AND ai.CUSTOMER_ID = #{customerId}
         ORDER BY
-            ai.ACTUAL_END_TIME DESC
+            ai.CREATED_TIME DESC
     </select>
 
     <!--  已结束-已参加人员列表  -->
@@ -556,7 +556,8 @@
     </select>
 
     <!--   已结束-已取消报名人员列表 -->
-    <select id="queryCanceledUserList" resultType="com.epmet.dto.result.work.CanceledUserResultDTO" parameterType="java.lang.String">
+    <select id="queryCanceledUserList" resultType="com.epmet.dto.result.work.CanceledUserResultDTO"
+            parameterType="java.lang.String">
         SELECT
             aur.id as actUserRelationId,
             aur.ACT_ID ,
@@ -579,7 +580,8 @@
     </select>
 
     <!--  工作端-查询已取消活动详情  -->
-    <select id="selectCanceledActInfo" parameterType="java.lang.String" resultType="com.epmet.dto.result.work.CanceledActDetailResultDTO">
+    <select id="selectCanceledActInfo" parameterType="java.lang.String"
+            resultType="com.epmet.dto.result.work.CanceledActDetailResultDTO">
         SELECT
             ai.id AS actId,
             ai.TITLE AS title,
@@ -603,4 +605,55 @@
         and ai.id=#{actId}
         and ai.ACT_STATUS='canceled'
     </select>
+
+    <!--  已结束-活动详情  -->
+    <select id="selectFinishedDetail" resultType="com.epmet.dto.result.work.FinishedActDetailResultDTO"
+            parameterType="java.lang.String">
+        SELECT
+            ai.id AS actId,
+            ai.TITLE AS title,
+            ai.SIGN_UP_END_TIME AS signUpEndTime,
+            AI.ACT_START_TIME AS actStartTime,
+            AI.ACT_END_TIME AS actEndTime,
+            AI.ACT_ADDRESS AS actAddress,
+            ai.ACT_QUOTA AS actQuota,
+            ai.ACT_QUOTA_CATEGORY AS actQuotaCategory,
+            ai.SPONSOR_CONTACTS AS sponsorContacts,
+            ai.SPONSOR_TEL AS sponsorTel,
+            ai.REWARD AS reward,
+            ai.SPONSOR_NAME AS sponsorName,
+            ai.REQUIREMENT AS requirement,
+            AI.SUMMARY_FLAG AS summaryFlag,
+            AI.ACTUAL_START_TIME AS actualStartTime,
+            AI.ACTUAL_END_TIME AS actualEndTime
+        FROM
+            act_info ai
+        WHERE
+            ai.DEL_FLAG = '0'
+            AND ai.ID = #{actId}
+    </select>
+
+    <!--  进行中-活动详情  -->
+    <select id="selectInProgressDetail" resultType="com.epmet.dto.result.work.InProgressActDetailResultDTO"
+            parameterType="java.lang.String">
+        SELECT
+            ai.id AS actId,
+            ai.TITLE AS title,
+            ai.SIGN_UP_END_TIME AS signUpEndTime,
+            AI.ACT_START_TIME AS actStartTime,
+            AI.ACT_END_TIME AS actEndTime,
+            AI.ACT_ADDRESS AS actAddress,
+            ai.ACT_QUOTA AS actQuota,
+            ai.ACT_QUOTA_CATEGORY AS actQuotaCategory,
+            ai.SPONSOR_CONTACTS AS sponsorContacts,
+            ai.SPONSOR_TEL AS sponsorTel,
+            ai.REWARD AS reward,
+            ai.SPONSOR_NAME AS sponsorName,
+            ai.REQUIREMENT AS requirement
+        FROM
+            act_info ai
+        WHERE
+            ai.DEL_FLAG = '0'
+            AND ai.ID = #{actId}
+    </select>
 </mapper>