Merge remote-tracking branch 'origin/hjc_yb_banner' into hjc_yb_banner

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetYbActivityController.java

@@ -91,13 +91,13 @@ public class SweetYbActivityController {
     @PostMapping("/export")
     @ApiOperation("活动列表导出")
     @ResponseBody
-    public AjaxResult exportMemberOrder(SweetYbActivityListParam param) {
-        List<SweetYbActivityExportVo> list = sweetYbActivityService.aExport(param);
+    public AjaxResult exportMemberOrder(String activityId) {
+        List<SweetYbActivityExportVo> list = sweetYbActivityService.aExport(activityId);
         if (list.size() == 0) {
             return AjaxResult.error("查无信息");
         }
         ExcelUtil<SweetYbActivityExportVo> util = new ExcelUtil(SweetYbActivityExportVo.class);
-        return util.exportExcel(list, "YB活动数据");
+        return util.exportExcel(list, "YB报名数据");
     }
 
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/dto/SweetYbActivityExportVo.java

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.sweet.dto;
 import com.liquidnet.client.admin.common.annotation.Excel;
 import com.liquidnet.service.kylin.dao.OrderExportDao;
 import com.liquidnet.service.sweet.entity.SweetYbActivity;
+import com.liquidnet.service.sweet.entity.SweetYbEnroll;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,16 +11,22 @@ import java.time.format.DateTimeFormatter;
 
 @Data
 public class SweetYbActivityExportVo implements Serializable, Cloneable {
-    @Excel(name = "活动id", cellType = Excel.ColumnType.STRING)
-    private String activityId;
-    @Excel(name = "活动名称", cellType = Excel.ColumnType.STRING)
-    private String title;
-    @Excel(name = "封面图地址", cellType = Excel.ColumnType.STRING)
-    private String cover;
-    @Excel(name = "活动开始时间", cellType = Excel.ColumnType.STRING)
-    private String startTime;
-    @Excel(name = "活动结束时间", cellType = Excel.ColumnType.STRING)
-    private String endTime;
+    @Excel(name = "联系电话", cellType = Excel.ColumnType.STRING)
+    private String contactTell;
+    @Excel(name = "联系微信", cellType = Excel.ColumnType.STRING)
+    private String contactWechat;
+    @Excel(name = "乐队名称", cellType = Excel.ColumnType.STRING)
+    private String nickname;
+    @Excel(name = "风格", cellType = Excel.ColumnType.STRING)
+    private String style;
+    @Excel(name = "图片地址", cellType = Excel.ColumnType.STRING)
+    private String imgUrl;
+    @Excel(name = "音频文件地址", cellType = Excel.ColumnType.STRING)
+    private String audioUrl;
+    @Excel(name = "院校", cellType = Excel.ColumnType.STRING)
+    private String universities;
+    @Excel(name = "常驻城市名称", cellType = Excel.ColumnType.STRING)
+    private String cityName;
     @Excel(name = "创建时间", cellType = Excel.ColumnType.STRING)
     private String createdAt;
 
@@ -35,12 +42,15 @@ public class SweetYbActivityExportVo implements Serializable, Cloneable {
         return new SweetYbActivityExportVo();
     }
 
-    public SweetYbActivityExportVo copyOrderExportVo(SweetYbActivity source) {
-        this.setActivityId(source.getActivityId());
-        this.setTitle(source.getTitle());
-        this.setCover(source.getCover());
-        this.setStartTime(source.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        this.setEndTime(source.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+    public SweetYbActivityExportVo copyOrderExportVo(SweetYbEnroll source) {
+        this.setContactTell(source.getContactTell());
+        this.setContactWechat(source.getContactWechat());
+        this.setNickname(source.getNickname());
+        this.setStyle(source.getStyle());
+        this.setImgUrl(source.getImgUrl());
+        this.setAudioUrl(source.getAudioUrl());
+        this.setUniversities(getUniversities());
+        this.setCityName(source.getCityName());
         this.setCreatedAt(source.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         return this;
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/ISweetYbActivityService.java

@@ -37,6 +37,6 @@ public interface ISweetYbActivityService  {
 
     AjaxResult aStatus(String activityId, Integer status);
 
-    List<SweetYbActivityExportVo> aExport(SweetYbActivityListParam param);
+    List<SweetYbActivityExportVo> aExport(String activityId);
 
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetYbActivityServiceImpl.java

@@ -19,8 +19,10 @@ import com.liquidnet.service.sweet.dto.param.admin.SweetYbActivityParam;
 import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.entity.SweetQrCode;
 import com.liquidnet.service.sweet.entity.SweetYbActivity;
+import com.liquidnet.service.sweet.entity.SweetYbEnroll;
 import com.liquidnet.service.sweet.mapper.SweetQrCodeMapper;
 import com.liquidnet.service.sweet.mapper.SweetYbActivityMapper;
+import com.liquidnet.service.sweet.mapper.SweetYbEnrollMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +46,8 @@ public class SweetYbActivityServiceImpl implements ISweetYbActivityService {
     SweetRedisAdminUtils sweetRedisAdminUtils;
     @Autowired
     SweetYbActivityMapper sweetYbActivityMapper;
+    @Autowired
+    SweetYbEnrollMapper sweetYbEnrollMapper;
 
     @Override
     public AjaxResult aInsert(SweetYbActivityParam param) {
@@ -142,12 +146,11 @@ public class SweetYbActivityServiceImpl implements ISweetYbActivityService {
     }
 
     @Override
-    public List<SweetYbActivityExportVo> aExport(SweetYbActivityListParam param) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    public List<SweetYbActivityExportVo> aExport(String activityId) {
         try {
-            List<SweetYbActivity> list = sweetYbActivityMapper.selectList(Wrappers.lambdaQuery(SweetYbActivity.class).like(SweetYbActivity::getTitle, param.getTitle()));
+            List<SweetYbEnroll> list = sweetYbEnrollMapper.selectList(Wrappers.lambdaQuery(SweetYbEnroll.class).eq(SweetYbEnroll::getActivityId, activityId));
             List<SweetYbActivityExportVo> voList = new ArrayList();
-            for (SweetYbActivity item : list) {
+            for (SweetYbEnroll item : list) {
                 voList.add(SweetYbActivityExportVo.getNew().copyOrderExportVo(item));
             }
             return voList;