ruoyi-admin/src/main/java/com/ruoyi/web/controller/clock/ActivityController.java

@@ -171,12 +171,26 @@ public class ActivityController extends BaseController {
      */
     @ApiOperation("查询活动打卡记录列表（分页）")
     @SaCheckPermission("clock:activity:clockRecord:list")
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @GetMapping("/clockRecord/page")
     public TableDataInfo<ActivityClockRecordVo> clockRecordPage(
             @Validated(QueryGroup.class) ActivityClockRecordBo bo, PageQuery pageQuery) {
         return iClockRecordService.queryActivityClockRecordPage(bo, pageQuery);
     }
 
+    /**
+     * 导出活动打卡记录信息列表
+     */
+    @ApiOperation("导出活动信息列表")
+    @Log(title = "活动信息", businessType = BusinessType.EXPORT)
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
+    @PostMapping("/clockRecordExport")
+    public void clockRecordExport(@Validated ActivityClockRecordBo bo, HttpServletResponse response) {
+        List<ActivityClockRecordVo> list = iClockRecordService.queryActivityClockRecordList(bo);
+        ExcelUtil.exportExcel(list, "活动打卡记录信息", ActivityClockRecordVo.class, response);
+    }
+
+
     /**
      * 查询活动打卡统计
      * 当前筛选条件下打卡店员人数与销售数量合计

ruoyi-system/src/main/java/com/ruoyi/clock/domain/vo/ActivityClockRecordVo.java

@@ -3,6 +3,7 @@ package com.ruoyi.clock.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -72,6 +73,7 @@ public class ActivityClockRecordVo {
      */
     @ExcelProperty(value = "打卡图片")
     @ApiModelProperty("打卡截图")
+    @FilePathValue
     private String screenshot;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/clock/domain/vo/SaleStatisticRecordVo.java

@@ -27,6 +27,9 @@ public class SaleStatisticRecordVo {
     @ApiModelProperty("店员姓名")
     private String employeeName;
 
+    @ApiModelProperty("代理商名称")
+    private String agentName;
+
     @ApiModelProperty("店员头像")
     private String avatar;
 

ruoyi-system/src/main/java/com/ruoyi/clock/mapper/ClockRecordMapper.java

@@ -34,6 +34,7 @@ public interface ClockRecordMapper extends BaseMapperPlus<ClockRecordMapper, Clo
      */
     Page<ActivityClockRecordVo> queryActivityClockRecordPage(Page<?> page,@Param("bo") ActivityClockRecordBo bo);
 
+    List<ActivityClockRecordVo> queryActivityClockRecordPage(@Param("bo") ActivityClockRecordBo bo);
 
     Page<SaleStatisticRecordVo> querySaleStatisticRecordList(Page<?> page,@Param("bo") SaleStatisticBo saleStatisticBo);
 

ruoyi-system/src/main/java/com/ruoyi/clock/service/IClockRecordService.java

@@ -143,6 +143,9 @@ public interface IClockRecordService {
      */
     TableDataInfo<ActivityClockRecordVo> queryActivityClockRecordPage(ActivityClockRecordBo bo, PageQuery pageQuery);
 
+    List<ActivityClockRecordVo> queryActivityClockRecordList(ActivityClockRecordBo bo);
+
+
     /**
      * 查询活动打卡统计（打卡人数 + 销售数量合计）
      *

ruoyi-system/src/main/java/com/ruoyi/clock/service/impl/ClockRecordServiceImpl.java

@@ -199,6 +199,11 @@ public class ClockRecordServiceImpl implements IClockRecordService {
         return TableDataInfo.build(page);
     }
 
+    @Override
+    public List<ActivityClockRecordVo> queryActivityClockRecordList(ActivityClockRecordBo bo) {
+        return baseMapper.queryActivityClockRecordPage(bo);
+    }
+
     @Override
     public ActivityClockStatisticVo queryActivityClockStatistic(ActivityClockRecordBo bo) {
         return baseMapper.queryActivityClockStatistic(bo);

ruoyi-system/src/main/resources/mapper/clock/ClockRecordMapper.xml

@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             RANK() OVER (ORDER BY IFNULL(SUM(p.amount), 0) DESC, COUNT(DISTINCT r.record_id) DESC) AS `rank`,
             r.employee_id AS employeeId,
             e.employee_name AS employeeName,
+            a.agent_name AS agentName,
             e.avatar AS avatar,
             s.shop_name AS shopName,
             IFNULL(SUM(p.amount), 0) AS saleCount
@@ -59,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
         LEFT JOIN tb_activity act ON r.activity_id = act.activity_id
         LEFT JOIN tb_employee e ON r.employee_id = e.employee_id
+        LEFT JOIN tb_agent a ON e.agent_id = a.agent_id
         LEFT JOIN tb_shop s ON e.shop_id = s.shop_id
         WHERE
            r.status = 0 and act.type = 1