合并分支 'qa' 到 'master'

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

 package com.wangxiaolu.promotion.controller.activity.temporary;
 
+import cn.hutool.core.date.DateUtil;
 import com.wangxiaolu.promotion.exception.DataException;
 import com.wangxiaolu.promotion.pojo.PageInfo;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
@@ -12,6 +13,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.Objects;
 
 /**
@@ -95,4 +97,10 @@ public class TemporaryActivityQueryController {
         }
         return R.success();
     }
+    @GetMapping("/currentTime")
+    public R getCurrentTime() {
+        // 格式化当前时间为 "yyyy-MM-dd HH:mm:ss" 格式
+        String currentTime = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+        return R.success(currentTime);
+    }
 }

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

@@ -132,7 +132,7 @@ public class TemporaryActivityClockCoreServiceImpl implements TemporaryActivityC
     public void clockInTodayPlan(TemporaryClockDto dto, Integer clockType) {
         if (Objects.isNull(dto.getId())) {
             ActivityPlanInfoDto planInfo = promPlanQueryService.selectById(dto.getPlanId());
-            if (Objects.isNull(planInfo) || (planInfo.getPlanStatus().equals(PlanStatus.EXECUTION.getCode()) && planInfo.getPattern().equals("单点CP"))){
+            if (Objects.isNull(planInfo)){
                 throw new ParamException(RCode.NOT_CLOCK_STORE_ERROR);
             }
             ManageEmployeeInfoDto employeeDto = manageEmployeeInfoDao.selectById(planInfo.getEmployeeId());