员工上报、打卡记录、修改活动模式

src/main/java/com/wangxiaolu/promotion/controller/activity/manage/activityplan/ActivityPlanInfoCoreController.java

 package com.wangxiaolu.promotion.controller.activity.manage.activityplan;
 
+import com.wangxiaolu.promotion.common.redis.RedisKeys;
+import com.wangxiaolu.promotion.common.redis.service.RedisCache;
 import com.wangxiaolu.promotion.common.util.NumberUtils;
 import com.wangxiaolu.promotion.exception.DataException;
 import com.wangxiaolu.promotion.pojo.activity.manage.vo.ActivityPlanInfoVo;
@@ -11,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Objects;
+
 /**
  * @author : liqiulin
  * @date : 2024-09-02 18
@@ -23,12 +27,18 @@ public class ActivityPlanInfoCoreController {
 
     @Autowired
     ActivityPlanInfoCoreService activityPlanInfoCoreService;
+    @Autowired
+    private RedisCache redisCache;
 
     @PutMapping("/update")
     public R updateActivityInfo(@RequestBody ActivityPlanInfoVo activityPlanInfoVo){
         if (NumberUtils.isNull(activityPlanInfoVo.getId()) && CollectionUtils.isEmpty(activityPlanInfoVo.getIds())){
             throw new DataException(RCode.SELECT_PARAMS_ERROR);
         }
+        if (Objects.nonNull(activityPlanInfoVo.getActivityPatternId())) {
+            activityPlanInfoVo.setActivityPattern(redisCache.getHash(RedisKeys.TemporaryKeys.TENOIRART_ACTIVITY_PATTERN.getKey(),
+                    String.valueOf(activityPlanInfoVo.getActivityPatternId())));
+        }
         activityPlanInfoCoreService.updateActivityInfo(activityPlanInfoVo);
         return R.success();
     }

src/main/java/com/wangxiaolu/promotion/controller/activity/manage/tem/EmployeeCoreTemClockController.java

 package com.wangxiaolu.promotion.controller.activity.manage.tem;
 
+import com.wangxiaolu.promotion.common.redis.RedisKeys;
+import com.wangxiaolu.promotion.common.redis.service.RedisCache;
 import com.wangxiaolu.promotion.pojo.activity.manage.vo.ClockVo;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
 import com.wangxiaolu.promotion.result.basedata.R;
@@ -20,6 +22,8 @@ public class EmployeeCoreTemClockController {
 
     @Autowired
     EmployeeCoreTemClockService employeeCoreTemClockService;
+    @Autowired
+    private RedisCache redisCache;
 
     // 修改员工打卡形式
     @PutMapping("/update")
@@ -27,8 +31,8 @@ public class EmployeeCoreTemClockController {
         TemporaryClockDto temporaryClockDto = new TemporaryClockDto();
         temporaryClockDto.setId(clockVo.getId())
                 .setActivityPatternId(clockVo.getActivityPatternId())
-                .setActivityPattern(clockVo.getActivityPattern());
-
+                .setActivityPattern(redisCache.getHash(RedisKeys.TemporaryKeys.TENOIRART_ACTIVITY_PATTERN.getKey(),
+                        String.valueOf(clockVo.getActivityPatternId())));
         employeeCoreTemClockService.updateClockactivityPattern(temporaryClockDto);
         return R.success();
     }

src/main/java/com/wangxiaolu/promotion/service/activity/manage/impl/ActivityPlanInfoCoreServiceImpl.java

@@ -24,17 +24,12 @@ public class ActivityPlanInfoCoreServiceImpl implements ActivityPlanInfoCoreServ
 
     @Autowired
     EmployeeActivityPlanInfoDao employeeActivityPlanInfoDao;
-    @Autowired
-    private RedisCache redisCache;
 
     @Override
     public void updateActivityInfo(ActivityPlanInfoVo activityPlanInfoVo) {
         ActivityPlanInfoWrapper wrap = new ActivityPlanInfoWrapper();
         BeanUtils.copyProperties(activityPlanInfoVo, wrap);
-        if (Objects.nonNull(activityPlanInfoVo.getActivityPatternId())) {
-            wrap.setActivityPattern(redisCache.getHash(RedisKeys.TemporaryKeys.TENOIRART_ACTIVITY_PATTERN.getKey(),
-                    String.valueOf(activityPlanInfoVo.getActivityPatternId())));
-        }
+
         employeeActivityPlanInfoDao.update(wrap);
     }
 

src/main/java/com/wangxiaolu/promotion/service/activity/manage/impl/EmployeeQueryTemActivityServiceImpl.java

@@ -51,7 +51,6 @@ public class EmployeeQueryTemActivityServiceImpl implements EmployeeQueryTemActi
         }
         temporaryActivityReportedDao.findPage(tw, pageInfo);
 
-        // 查询活动记录关联的售卖单元列表（一次性查出）
         if (CollectionUtils.isEmpty(pageInfo.getRecords())) {
             return;
         }