Browse Source

活动信息

pengcheng 1 month ago
parent
commit
685007e0fd

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

@@ -139,6 +139,11 @@ public class ActivityController extends BaseController {
     @PostMapping("/export")
     public void export(@Validated ActivityBo bo, HttpServletResponse response) {
         List<ActivityVo> list = iActivityService.queryList(bo);
+        list.forEach(item -> {
+            item.loadAgentList();
+            item.loadProductList();
+            item.loadImage();
+        });
         ExcelUtil.exportExcel(list, "活动信息", ActivityVo.class, response);
     }
 

+ 12 - 2
ruoyi-system/src/main/java/com/ruoyi/clock/domain/vo/ActivityVo.java

@@ -42,7 +42,6 @@ public class ActivityVo extends BaseEntity {
     /**
      * 活动id
      */
-    @ExcelProperty(value = "活动id")
     @ApiModelProperty("活动id")
     private Long activityId;
 
@@ -93,11 +92,13 @@ public class ActivityVo extends BaseEntity {
     /**
      * 活动图片
      */
-    @ExcelProperty(value = "活动图片")
     @ApiModelProperty("活动图片")
     @TableField(typeHandler = ListToStringTypeHandler.class)
     private List<String> image;
 
+    @ExcelProperty(value = "图片信息")
+    private String imageUrl;
+
     /**
      * 单位 0 盒 1 支
      */
@@ -153,4 +154,13 @@ public class ActivityVo extends BaseEntity {
         }
         return this.productList;
     }
+
+    public void loadImage(){
+        if (ObjectUtil.isNotNull(this.image)){
+            if (ObjectUtil.isNotEmpty(image)){
+                this.imageUrl = image.stream()
+                    .collect(Collectors.joining(","));
+            }
+        }
+    }
 }

+ 0 - 1
ruoyi-system/src/main/java/com/ruoyi/clock/service/impl/ActivityServiceImpl.java

@@ -63,7 +63,6 @@ public class ActivityServiceImpl implements IActivityService {
      */
     @Override
     public List<ActivityVo> queryList(ActivityBo bo) {
-        LambdaQueryWrapper<Activity> lqw = buildQueryWrapper(bo);
         return baseMapper.selectActivityList(bo);
     }