feat(activity): 删除report

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityTaskClockCoreController.java

 package com.wangxiaolu.promotion.controller.activity.temporary;
 
+import com.wangxiaolu.promotion.common.enums.FlagType;
 import com.wangxiaolu.promotion.pojo.activity.temporary.vo.TemporaryActivityTaskClockReq;
 import com.wangxiaolu.promotion.result.basedata.R;
 import com.wangxiaolu.promotion.domain.activity.mapper.entity.TemporaryActivityTaskClockDO;
 import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityTaskClockService;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 
 /**
@@ -20,6 +22,7 @@ public class TemporaryActivityTaskClockCoreController {
 
     /**
      * 打卡更新打卡状态
+     *
      * @param clockVo
      * @return
      */
@@ -36,8 +39,9 @@ public class TemporaryActivityTaskClockCoreController {
 
     @DeleteMapping("/delete/{id}")
     public R delete(@PathVariable Long id) {
-        TemporaryActivityTaskClockDO taskClock = TemporaryActivityTaskClockDO.builder()
-                .id(id).isDelete(0).build();
+        TemporaryActivityTaskClockDO taskClock = new TemporaryActivityTaskClockDO();
+        taskClock.setClockId(id)
+                .setIsDelete(FlagType.NO.getType());
         return R.success(service.updateById(taskClock));
     }
 }

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityPhotoDaoImpl.java

@@ -121,7 +121,8 @@ public class TemporaryActivityPhotoDaoImpl implements TemporaryActivityPhotoDao
     @Override
     public Map<Integer, List<TemporaryActivityPhotoDto>> findReportedInfoGroup(Integer temporaryId, Long reportedId) {
         LambdaQueryWrapper<TemporaryActivityPhotoDO> wq = new LambdaQueryWrapper<>();
-        wq.eq(TemporaryActivityPhotoDO::getReportedId, reportedId).eq(TemporaryActivityPhotoDO::getIsDelete, StatusType.VALID.getType());
+        wq.eq(TemporaryActivityPhotoDO::getReportedId, reportedId)
+                .eq(TemporaryActivityPhotoDO::getIsDelete, StatusType.VALID.getType());
         List<TemporaryActivityPhotoDO> dos = temporaryActivityPhotoMapper.selectList(wq);
         if (CollectionUtils.isEmpty(dos)) {
             return null;

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityTaskClockDaoImpl.java

@@ -64,7 +64,9 @@ public class TemporaryActivityTaskClockDaoImpl implements TemporaryActivityTaskC
 
     @Override
     public void updateTaskClock(TemporaryTaskClockDto updateTaskClockDto) {
-        TemporaryActivityTaskClockDO updateTaskClockDo = BeanUtils.transitionDto(updateTaskClockDto, TemporaryActivityTaskClockDO.class);
+        TemporaryActivityTaskClockDO updateTaskClockDo = new TemporaryActivityTaskClockDO();
+        BeanUtils.copyProperties(updateTaskClockDto, updateTaskClockDo);
+
         temporaryActivityTaskClockMapper.updateById(updateTaskClockDo);
 
     }

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/TemporaryActivityTaskClockDO.java

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -15,7 +18,9 @@ import java.util.Date;
  */
 @TableName(value = "temporary_activity_task_clock")
 @Data
-@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
 public class TemporaryActivityTaskClockDO implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityTaskClockServiceImpl.java

@@ -50,6 +50,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
 
     /**
      * 生成随机打卡任务
+     *
      * @param dto
      */
     @Override
@@ -60,7 +61,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
                 .setTaskType(ActivityPhotoType.RANDOM_TASK.getType())
                 .setIsDelete(FlagType.NO.getType());
         TemporaryActivityTaskClockDO taskClockDO1 = temporaryActivityTaskClockDao.selectOne(wrapper);
-        if(ObjectUtil.isNotEmpty(taskClockDO1)){
+        if (ObjectUtil.isNotEmpty(taskClockDO1)) {
             return;
         }
 
@@ -69,26 +70,26 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
 
         Date randomDate = DateUtils.parseDateByLocalTime(randomTime);
         // 生成
-        TemporaryActivityTaskClockDO taskClockDO = TemporaryActivityTaskClockDO.builder()
-                .temporaryId(dto.getTemporaryId())
-                .clockId(dto.getId())
-                .temporaryName(dto.getTemporaryName())
-                .reportedId(dto.getReportedId())
-                .planId(dto.getPlanId())
-                .clockTime(null)
-                .taskType(ActivityPhotoType.RANDOM_TASK.getType())
-                .taskStatus(ActivityClockTaskStatus.TO_BE_START.getType())
-                .requiredlockTime(randomDate)
-                .activityPatternId(dto.getActivityPatternId())
-                .activityPattern(dto.getActivityPattern())
-                .isDelete(1)
-                .build();
+        TemporaryActivityTaskClockDO taskClockDO = new TemporaryActivityTaskClockDO();
+        taskClockDO.setClockId(dto.getId())
+                .setTemporaryName(dto.getTemporaryName())
+                .setReportedId(dto.getReportedId())
+                .setPlanId(dto.getPlanId())
+                .setClockTime(null)
+                .setTaskType(ActivityPhotoType.RANDOM_TASK.getType())
+                .setSubscribeTime(randomDate)
+                .setTaskStatus(ActivityClockTaskStatus.TO_BE_START.getType())
+                .setRequiredlockTime(randomDate)
+                .setActivityPatternId(dto.getActivityPatternId())
+                .setActivityPattern(dto.getActivityPattern())
+                .setIsDelete(FlagType.NO.getType());
         temporaryActivityTaskClockDao.save(taskClockDO);
 
     }
 
     /**
      * 生成POS数据上传任务
+     *
      * @param dto
      */
     @Override
@@ -99,24 +100,22 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
                 .setTaskType(ActivityPhotoType.POS_PHOTO.getType())
                 .setIsDelete(FlagType.NO.getType());
         TemporaryActivityTaskClockDO taskClockDO1 = temporaryActivityTaskClockDao.selectOne(wrapper);
-        if(ObjectUtil.isNotEmpty(taskClockDO1)){
+        if (ObjectUtil.isNotEmpty(taskClockDO1)) {
             return;
         }
         // 生成
-        TemporaryActivityTaskClockDO taskClockDO = TemporaryActivityTaskClockDO.builder()
-                .temporaryId(dto.getTemporaryId())
-                .clockId(dto.getId())
-                .temporaryName(dto.getTemporaryName())
-                .reportedId(dto.getReportedId())
-                .planId(dto.getPlanId())
-                .clockTime(null)
-                .taskType(ActivityPhotoType.POS_PHOTO.getType())
-                .taskStatus(ActivityClockTaskStatus.STARTING.getType())
-                .requiredlockTime(DateUtil.endOfDay(new Date()))
-                .activityPatternId(dto.getActivityPatternId())
-                .activityPattern(dto.getActivityPattern())
-                .isDelete(1)
-                .build();
+        TemporaryActivityTaskClockDO taskClockDO = new TemporaryActivityTaskClockDO();
+        taskClockDO.setClockId(dto.getId())
+                .setTemporaryName(dto.getTemporaryName())
+                .setReportedId(dto.getReportedId())
+                .setPlanId(dto.getPlanId())
+                .setClockTime(null)
+                .setTaskType(ActivityPhotoType.POS_PHOTO.getType())
+                .setTaskStatus(ActivityClockTaskStatus.STARTING.getType())
+                .setRequiredlockTime(null)
+                .setActivityPatternId(dto.getActivityPatternId())
+                .setActivityPattern(dto.getActivityPattern())
+                .setIsDelete(1);
         temporaryActivityTaskClockDao.save(taskClockDO);
     }
 
@@ -134,7 +133,8 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
     }
 
     /**
-     *  打卡打卡
+     * 打卡打卡
+     *
      * @param clockVo
      */
     @Override
@@ -165,11 +165,11 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
                 .setTemporaryId(taskClockDO.getTemporaryId())
                 .setReportedId(taskClockDO.getReportedId())
                 .setType(clockVo.getTaskType());
-        if(CollectionUtils.isEmpty(clockVo.getClockPhotos())){
-            photoDao.deleteList(taskClockDO.getReportedId(),clockVo.getTaskType());
-        }else{
+        if (CollectionUtils.isEmpty(clockVo.getClockPhotos())) {
+            photoDao.deleteList(taskClockDO.getReportedId(), clockVo.getTaskType());
+        } else {
             // 保存打卡图片
-            photoDao.saveClockTaskPhoto(dto,clockVo.getClockPhotos());
+            photoDao.saveClockTaskPhoto(dto, clockVo.getClockPhotos());
         }
 
     }
@@ -184,7 +184,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
                 .setTaskType(taskType)
                 .setTemporaryId(Integer.parseInt(userId))
                 .setIsDelete(FlagType.NO.getType());
-        TemporaryActivityTaskClockDO  taskClockDO = temporaryActivityTaskClockDao.selectOne(wrapper);
+        TemporaryActivityTaskClockDO taskClockDO = temporaryActivityTaskClockDao.selectOne(wrapper);
         TemporaryActivityTaskClockRes res = new TemporaryActivityTaskClockRes();
         if (taskClockDO != null) {
             BeanUtils.copyProperties(taskClockDO, res);
@@ -192,7 +192,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
             TemporaryPhotoWrapper photoWrapper = new TemporaryPhotoWrapper()
                     .setReportedId(taskClockDO.getReportedId())
                     .setTemporaryId(taskClockDO.getTemporaryId());
-             List<TemporaryActivityPhotoDto> photoDtos = photoDao.selectPhotos(photoWrapper);
+            List<TemporaryActivityPhotoDto> photoDtos = photoDao.selectPhotos(photoWrapper);
             List<String> photoUrls = photoDtos.stream()
                     .filter(photoDto -> photoDto.getType().equals(taskType))
                     .map(TemporaryActivityPhotoDto::getPhotoUrl)