促销员查询当日活动上报信息

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

@@ -39,8 +39,17 @@ public class TemporaryActivityQueryController {
      * 根据促销员id查询今日任务
      */
     @GetMapping("/today/{id}")
-    public TemporaryActivityReportedDto findtemporaryIdTodayActivityData(@PathVariable("id") @NotNull Long temporaryId) {
+    public TemporaryActivityReportedDto findTemporaryTodayActivityData(@PathVariable("id") @NotNull Long temporaryId) {
         TemporaryActivityReportedDto dto = temporaryActivityQueryService.findtemporaryIdTodayActivityData(temporaryId);
         return dto;
     }
+
+    /**
+     * 根据任务id查询
+     */
+    @GetMapping("/{id}")
+    public TemporaryActivityReportedDto findTemporaryActivityById(@PathVariable("id") @NotNull Long activityId){
+        TemporaryActivityReportedDto dto = temporaryActivityQueryService.findTemporaryActivityById(activityId);
+        return dto;
+    }
 }

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/TemporaryActivityReportedDao.java

@@ -15,4 +15,6 @@ public interface TemporaryActivityReportedDao {
     List<TemporaryActivityReportedDto> findListByTemporaryId(Long temporaryId);
 
     TemporaryActivityReportedDto findOneByCurrentDate(Long temporaryId);
+
+    TemporaryActivityReportedDto findTemporaryActivityById(Long activityId);
 }

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

@@ -39,6 +39,8 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
 
         TemporaryActivityReportedDO tDo = new TemporaryActivityReportedDO();
         BeanUtils.copyProperties(temActDto, tDo);
+
+        tDo.setApproveStatus(temActDto.getApproveStatus().name());
         tDo.setCreateDate(DateUtil.today());
 
         int tId = temporaryActivityReportedMapper.insert(tDo);
@@ -71,6 +73,12 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
         return transitionDto(temDO);
     }
 
+    @Override
+    public TemporaryActivityReportedDto findTemporaryActivityById(Long activityId) {
+        TemporaryActivityReportedDO temDO = temporaryActivityReportedMapper.selectById(activityId);
+        return transitionDto(temDO);
+    }
+
 
     private LambdaQueryWrapper<TemporaryActivityReportedDO> buildQueryList(TemporaryActivityWrapper tw) {
         LambdaQueryWrapper<TemporaryActivityReportedDO> queryWrapper = new LambdaQueryWrapper<>();

src/main/java/com/wangxiaolu/promotion/pojo/PageVo.java

+package com.wangxiaolu.promotion.pojo;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-04-19 13
+ * @describe : 分页配置，默认每页10条记录
+ */
+public class PageVo {
+    /**
+     * 当前页数，从0开始
+     */
+    private Integer pageNum;
+
+    /**
+     * 每页条数
+     */
+    private Integer pageSize;
+
+    /**
+     * 总条数
+     */
+    private Integer totalRecord;
+
+    /**
+     * 总页数
+     */
+    private Integer totalPage;
+}

src/main/java/com/wangxiaolu/promotion/pojo/user/dto/WxTemporaryInfoDto.java

@@ -21,7 +21,7 @@ public class WxTemporaryInfoDto {
     /**
      * temporary_info表id
      */
-    private Integer id;
+    Integer id;
     /**
      * openId
      */

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/TemporaryActivityQueryService.java

@@ -20,4 +20,6 @@ public interface TemporaryActivityQueryService {
      * 根据促销员id查询今日任务
      */
     TemporaryActivityReportedDto findtemporaryIdTodayActivityData(Long temporaryId);
+
+    TemporaryActivityReportedDto findTemporaryActivityById(Long activityId);
 }

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

@@ -28,6 +28,7 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
      */
     @Override
     public long activityDataReportedSave(TemporaryActivityReportedDto temActDto) {
+        temActDto.setApproveStatus(TemActApproveStatus.SUBMITTED);
         return temporaryActivityReportedDao.activityDataSave(temActDto);
     }
 }

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

@@ -39,4 +39,10 @@ public class TemporaryActivityQueryServiceImpl implements TemporaryActivityQuery
         TemporaryActivityReportedDto dto = temporaryActivityReportedDao.findOneByCurrentDate(temporaryId);
         return dto;
     }
+
+    @Override
+    public TemporaryActivityReportedDto findTemporaryActivityById(Long activityId) {
+        TemporaryActivityReportedDto dto = temporaryActivityReportedDao.findTemporaryActivityById(activityId);
+        return dto;
+    }
 }