feat(promotion): 添加活动任务时钟查询条件及字段优化

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

@@ -54,10 +54,14 @@ public class TemporaryActivityTaskClockDaoImpl implements TemporaryActivityTaskC
 
     @Override
     public TemporaryActivityTaskClockDO selectOne(TemporaryActivityTaskWrapperDto wrapper) {
-        TemporaryActivityTaskClockDO temporaryActivityTaskClockDO = temporaryActivityTaskClockMapper.selectOne(new LambdaQueryWrapper<TemporaryActivityTaskClockDO>()
-                .eq(TemporaryActivityTaskClockDO::getTemporaryId, wrapper.getTemporaryId())
-                .eq(TemporaryActivityTaskClockDO::getTaskType, wrapper.getTaskType())
-                .eq(TemporaryActivityTaskClockDO::getIsDelete, wrapper.getIsDelete()));
+        TemporaryActivityTaskClockDO temporaryActivityTaskClockDO = temporaryActivityTaskClockMapper.selectOne(
+                new LambdaQueryWrapper<TemporaryActivityTaskClockDO>()
+                .eq(ObjectUtil.isNotEmpty(wrapper.getTemporaryId()),TemporaryActivityTaskClockDO::getTemporaryId, wrapper.getTemporaryId())
+                .eq(ObjectUtil.isNotEmpty(wrapper.getTaskType()),TemporaryActivityTaskClockDO::getTaskType, wrapper.getTaskType())
+                .eq(ObjectUtil.isNotEmpty(wrapper.getIsDelete()),TemporaryActivityTaskClockDO::getIsDelete, wrapper.getIsDelete())
+                // 当天的数据
+                .eq(ObjectUtil.isNotEmpty(wrapper.getCreateDate()),TemporaryActivityTaskClockDO::getCreateDate, wrapper.getCreateDate())
+        );
 
         return temporaryActivityTaskClockDO;
     }

src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryActivityTaskWrapperDto.java

@@ -42,4 +42,6 @@ public class TemporaryActivityTaskWrapperDto {
      * 0:删除；1：可用
      */
     private Integer isDelete;
+    private String createDate;
+
 }

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/dto/TemporaryTaskClockDto.java

@@ -25,7 +25,7 @@ public class TemporaryTaskClockDto {
      */
     private Long id;
 
-    private Integer temporaryId;
+    private Long temporaryId;
 
     /**
      * 活动打卡id

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

@@ -62,6 +62,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
         wrapper.setTemporaryId(dto.getTemporaryId())
                 .setClockId(dto.getId())
                 .setTaskType(ActivityPhotoType.RANDOM_TASK.getType())
+                .setCreateDate(DateUtil.today())
                 .setIsDelete(FlagType.NO.getType());
         TemporaryActivityTaskClockDO taskClockDO1 = temporaryActivityTaskClockDao.selectOne(wrapper);
         if (ObjectUtil.isNotEmpty(taskClockDO1)) {
@@ -103,6 +104,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
         wrapper.setTemporaryId(dto.getTemporaryId())
                 .setClockId(dto.getId())
                 .setReportId(dto.getReportedId())
+                .setCreateDate(DateUtil.today())
                 .setTaskType(ActivityPhotoType.POS_PHOTO.getType())
                 .setIsDelete(FlagType.NO.getType());
         TemporaryActivityTaskClockDO taskClockDO1 = temporaryActivityTaskClockDao.selectOne(wrapper);
@@ -190,6 +192,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
         TemporaryActivityTaskWrapperDto wrapper = new TemporaryActivityTaskWrapperDto()
                 .setUserId(Long.parseLong(userId))
                 .setTaskType(taskType)
+                .setCreateDate(DateUtil.today())
                 .setTemporaryId(Long.parseLong(userId))
                 .setIsDelete(FlagType.NO.getType());
         TemporaryActivityTaskClockDO taskClockDO = temporaryActivityTaskClockDao.selectOne(wrapper);