heart-work:已结束-保存活动实际开始结束时间

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -57,7 +57,7 @@ public enum EpmetErrorCode {
 	ACT_START_TIME_ERROR(8119,"活动预计开始时间应早于活动预计结束时间"),
 	ACT_SIGN_IN_START_TIME_ERROR(8120,"签到开始时间应早于签到结束时间"),
 	ACT_SIGN_UP_END_TIME_ERROR(8121,"活动报名截止时间应早于活动预计开始时间"),
-
+	ACT_ACTUAL_START_TIME_ERROR(8122,"实际开始时间应早于实际结束时间"),
 
     CANNOT_AUDIT_WARM(8201, "请完善居民信息"),
 	NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"),

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -502,4 +502,12 @@ public class DateUtils {
         return null;
     }
 
+    public static Integer calculateMin(Date startDate,Date endDate){
+        long start=startDate.getTime();
+        long end=endDate.getTime();
+        // 计算差多少分钟
+        int minutes = (int) ((end - start) / (1000 * 60));
+        System.out.println("两个时间之间的分钟差为：" + minutes);
+        return minutes;
+    }
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/SaveActualTimeFormDTO.java

@@ -0,0 +1,40 @@
+package com.epmet.dto.form.work;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 已结束-保存活动实际开始结束时间
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/7/26 19:43
+ */
+@Data
+public class SaveActualTimeFormDTO implements Serializable {
+    private static final long serialVersionUID = -3668309257254318868L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface UserShowGroup extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 活动id
+     */
+    @NotBlank(message = "活动id不能为空", groups = {AddUserInternalGroup.class})
+    private String actId;
+    /**
+     * 实际开始时间yyyy-MM-dd HH:mm
+     */
+    @NotBlank(message = "实际开始时间不能为空", groups = {UserShowGroup.class})
+    private String actualStartTime;
+    /**
+     * 实际结束时间yyyy-MM-dd HH:mm
+     */
+    @NotBlank(message = "实际结束时间不能为空", groups = {UserShowGroup.class})
+    private String actualEndTime;
+}

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

@@ -135,4 +135,19 @@ public class WorkActController {
         ValidatorUtils.validateEntity(actIdFormDTO, ActIdFormDTO.AddUserInternalGroup.class);
         return new Result<CanceledActDetailResultDTO>().ok(workActService.canceledDetail(actIdFormDTO.getActId()));
     }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @description 已结束-保存活动实际开始结束时间
+     * @Date 2020/7/26 19:48
+     **/
+    @PostMapping("saveactualtime")
+    public Result saveActualTime(@RequestBody SaveActualTimeFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SaveActualTimeFormDTO.UserShowGroup.class,
+                SaveActualTimeFormDTO.AddUserInternalGroup.class);
+        workActService.saveActualTime(formDTO);
+        return new Result();
+    }
 }

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

@@ -3,6 +3,7 @@ package com.epmet.service;
 import com.epmet.dto.form.work.ActListCommonFormDTO;
 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;
@@ -85,4 +86,13 @@ public interface WorkActService {
      * @Date 2020/7/26 18:00
      **/
     CanceledActDetailResultDTO canceledDetail(String actId);
+
+    /**
+     * @return void
+     * @param formDTO
+     * @author yinzuomei
+     * @description 已结束-保存活动实际开始结束时间
+     * @Date 2020/7/26 19:49
+     **/
+    void saveActualTime(SaveActualTimeFormDTO formDTO);
 }

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

@@ -12,6 +12,7 @@ import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ActConstant;
@@ -24,10 +25,7 @@ import com.epmet.dao.ActUserRelationDao;
 import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.dto.form.work.ActListCommonFormDTO;
-import com.epmet.dto.form.work.CancelActFormDTO;
-import com.epmet.dto.form.work.PublishActContentFormDTO;
-import com.epmet.dto.form.work.PublishActInfoFormDTO;
+import com.epmet.dto.form.work.*;
 import com.epmet.dto.result.ActSponsorResultDTO;
 import com.epmet.dto.result.work.*;
 import com.epmet.entity.ActContentEntity;
@@ -560,4 +558,25 @@ public class WorkActServiceImpl implements WorkActService {
         }
         return canceledActDetailResultDTO;
     }
+
+    /**
+     * @param formDTO
+     * @return void
+     * @author yinzuomei
+     * @description 已结束-保存活动实际开始结束时间
+     * @Date 2020/7/26 19:49
+     **/
+    @Override
+    public void saveActualTime(SaveActualTimeFormDTO formDTO) {
+        if(formDTO.getActualStartTime().compareTo(formDTO.getActualEndTime())!=-1){
+            throw new RenException(EpmetErrorCode.ACT_ACTUAL_START_TIME_ERROR.getCode());
+        }
+        ActInfoDTO actInfoDTO=actInfoService.get(formDTO.getActId());
+        Date actualStartTime= DateUtils.minStrToSecondDate(formDTO.getActualStartTime());
+        actInfoDTO.setActualStartTime(actualStartTime);
+        Date actualEndTime= DateUtils.minStrToSecondDate(formDTO.getActualEndTime());
+        actInfoDTO.setActualEndTime(actualEndTime);
+        actInfoDTO.setServiceMin(DateUtils.calculateMin(actualStartTime,actualEndTime));
+        actInfoService.update(actInfoDTO);
+    }
 }