合并分支 'dxy' 到 'qa'

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

 package com.wangxiaolu.promotion.controller.activity.manage.tem;
 
+import com.wangxiaolu.promotion.annotation.Log;
+import com.wangxiaolu.promotion.enums.log.BusinessType;
 import com.wangxiaolu.promotion.pojo.PageInfo;
 import com.wangxiaolu.promotion.result.basedata.R;
 import com.wangxiaolu.promotion.service.activity.manage.EmployeeQueryTemActivityService;
@@ -26,6 +28,7 @@ public class EmployeeQueryTemActivityController {
      * @param loginQcId 员工
      * @return 活动数据
      */
+    @Log(title = "CP任务",businessType = BusinessType.QUERY)
     @PostMapping("/page")
     public R findActivitys(String loginQcId, @RequestBody PageInfo pageInfo) {
         employeeQueryTemActivityService.getEmployeeApproveActivityPage(loginQcId, pageInfo);

src/main/java/com/wangxiaolu/promotion/controller/activityplanv2/PromPlanQueryController.java

 package com.wangxiaolu.promotion.controller.activityplanv2;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.wangxiaolu.promotion.annotation.Log;
 import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryActivityWrapper;
 import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
+import com.wangxiaolu.promotion.enums.log.BusinessType;
 import com.wangxiaolu.promotion.pojo.PageInfo;
 import com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto;
 import com.wangxiaolu.promotion.pojo.activity.inspectionInfo.dto.InspectionInfoDto;
@@ -40,6 +42,7 @@ public class PromPlanQueryController {
     @Autowired
     private ExaPlanQueryService exaPlanQueryService;
 
+    @Log(title = "CP计划",businessType = BusinessType.QUERY)
     @PostMapping("/page")
     public R queryPage(@RequestBody PageInfo pageInfo){
         promPlanQueryService.queryPage(pageInfo);
@@ -49,6 +52,7 @@ public class PromPlanQueryController {
     /**
      * 根据计划ID查询任务、打卡信息
      */
+    @Log(title = "CP计划",businessType = BusinessType.QUERY)
     @GetMapping("/{id}")
     public R queryPlanById(@PathParam("id") @PathVariable Long id){
         // 查询计划

src/main/java/com/wangxiaolu/promotion/controller/user/tem/TemporaryInfoCoreController.java

 package com.wangxiaolu.promotion.controller.user.tem;
 
+import com.wangxiaolu.promotion.annotation.Log;
 import com.wangxiaolu.promotion.common.redis.service.RedisCache;
 import com.wangxiaolu.promotion.common.util.DataUtils;
 import com.wangxiaolu.promotion.common.util.EnvUtil;
 import com.wangxiaolu.promotion.domain.user.mapper.entity.WxTemporaryInfoDelayDO;
+import com.wangxiaolu.promotion.enums.log.BusinessType;
 import com.wangxiaolu.promotion.exception.ParamException;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.WxTemporaryInfoDelayDtO;
 import com.wangxiaolu.promotion.pojo.user.dto.WxTemporaryInfoDto;
@@ -75,6 +77,7 @@ public class TemporaryInfoCoreController {
         return R.success(weChatUserCoreService.saveWxUserInfoTemporary(temporaryDto));
     }
 
+    @Log(title = "CP促销员",businessType = BusinessType.UPDATE)
     @PutMapping("/temporary/changeStoreInfo")
     public R changeUserInfo(@RequestBody  WxTemporaryEnrollVo wxTemporaryEnrollVo) {
         if (wxTemporaryEnrollVo.getOpenId() == null) {

src/main/java/com/wangxiaolu/promotion/controller/user/tem/TemporaryInfoQueryController.java

 package com.wangxiaolu.promotion.controller.user.tem;
 
+import com.wangxiaolu.promotion.annotation.Log;
 import com.wangxiaolu.promotion.common.redis.service.RedisCache;
 import com.wangxiaolu.promotion.common.util.DataUtils;
+import com.wangxiaolu.promotion.enums.log.BusinessType;
 import com.wangxiaolu.promotion.exception.ParamException;
 import com.wangxiaolu.promotion.pojo.PageInfo;
 import com.wangxiaolu.promotion.pojo.user.vo.LoginVo;
@@ -93,6 +95,7 @@ public class TemporaryInfoQueryController {
      * 促销员信息 - 分页查询
      * @param
      */
+    @Log(title = "CP促销员",businessType = BusinessType.QUERY)
     @PostMapping("/temporary/page")
     public R findTemporaryInfo(@RequestBody PageInfo pageInfo) {
         weChatUserQueryService.queryPage(pageInfo);

src/main/java/com/wangxiaolu/promotion/enums/log/BusinessType.java

@@ -56,4 +56,8 @@ public enum BusinessType
      * 清空数据
      */
     CLEAN,
+    /**
+     * 查询
+     */
+    QUERY,
 }