导出 html完善

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

@@ -7,12 +7,10 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
-import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderExpressExportExcelListDao;
 import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityDrawService;
-import com.liquidnet.service.kylin.dao.OrderExpressExportListDao;
-import com.liquidnet.service.sweet.dto.SweetIntegralActivityDto;
+import com.liquidnet.client.admin.zhengzai.sweet.service.dto.SweetActivityDrawExcelListDao;
+import com.liquidnet.service.sweet.dto.SweetActivityDrawListDao;
 import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityDrawListSearchParam;
-import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -59,11 +57,11 @@ public class SweetIntegralActivityDrawController extends BaseController {
     @PostMapping("/export")
     @ResponseBody
     public AjaxResult export(@RequestParam("ids") String integralActivityId) {
-        List<OrderExpressExportListDao> list = iSweetIntegralActivityDrawService.selectExpressList(integralActivityId);
-        ExcelUtil<OrderExpressExportExcelListDao> excelUtil = new ExcelUtil<>(OrderExpressExportExcelListDao.class);
-        List<OrderExpressExportExcelListDao> excelList = new ArrayList<>();
+        List<SweetActivityDrawListDao> list = iSweetIntegralActivityDrawService.selectExcelList(integralActivityId);
+        ExcelUtil<SweetActivityDrawExcelListDao> excelUtil = new ExcelUtil<>(SweetActivityDrawExcelListDao.class);
+        List<SweetActivityDrawExcelListDao> excelList = new ArrayList<>();
         list.forEach(r -> {
-            excelList.add(OrderExpressExportExcelListDao.getNew().copy(r));
+            excelList.add(SweetActivityDrawExcelListDao.getNew().copy(r));
         });
         return excelUtil.exportExcel(excelList, "积分活动导出中奖列表数据");
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/list.html

@@ -40,14 +40,22 @@
     var updateFlag = [[${@permission.hasPermi('sweet:integralActivity:create')}]];
     var isOnlineFlag = [[${@permission.hasPermi('sweet:integralActivity:isOnline')}]];
     var drawListFlag = [[${@permission.hasPermi('sweet:integralActivityDraw:list')}]];
+    var exportExcelFlag = [[${@permission.hasPermi('sweet:integralActivityDraw:export')}]];
 
     var prefix = ctx + "sweet/integralActivity";
+
+    function exportExcel(integralActivityId) {
+        var data = {"ids": integralActivityId};
+        $.table.exportExcel("", data)
+    }
+
     $(function () {
         var options = {
             url: prefix + "/list",
             updateUrl: prefix + "/formView", // /update/{id}
             createUrl: prefix + "/formView",
-            detailUrl: prefix + "/sweet/integralActivityDraw/drawList/{id}",
+            detailUrl: "/sweet/IntegralActivityDraw/listView/{id}",
+            exportUrl: "/sweet/IntegralActivityDraw/export",
             modalName: "积分活动",
             columns: [{
                 checkbox: true
@@ -118,6 +126,7 @@
                         actions.push('<a class="btn btn-success btn-xs ' + drawListFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.integralActivityId + '\')"><i class="fa fa-edit"></i>查看中奖名单</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + updateFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.integralActivityId + '\')"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + isOnlineFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.integralActivityId + '\')"></i>上下线</a> ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + exportExcelFlag + '" href="javascript:void(0)" onclick="exportExcel(\'' + row.integralActivityId + '\')"></i>导出中奖信息</a> ');
                         return actions.join('');
                     }
                 }]

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

 package com.liquidnet.client.admin.zhengzai.sweet.service;
 
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.service.kylin.dao.OrderExpressExportListDao;
+import com.liquidnet.service.sweet.dto.SweetActivityDrawListDao;
 import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityDrawListSearchParam;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -20,5 +20,5 @@ public interface ISweetIntegralActivityDrawService extends IService<SweetIntegra
 
     PageInfo<SweetIntegralActivityDraw> drawList(SweetIntegralActivityDrawListSearchParam listParam);
 
-    List<OrderExpressExportListDao> selectExpressList(String integralActivityId);
+    List<SweetActivityDrawListDao> selectExcelList(String integralActivityId);
 }

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

+package com.liquidnet.client.admin.zhengzai.sweet.service.dto;
+
+import com.liquidnet.client.admin.common.annotation.Excel;
+import com.liquidnet.service.sweet.dto.SweetActivityDrawListDao;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class SweetActivityDrawExcelListDao implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -3918944925598231439L;
+
+    @Excel(name = "活动id")
+    private String integralActivityId;
+    @Excel(name = "奖品id")
+    private String prizeId;
+    @Excel(name = "用户id")
+    private String userId;
+    @Excel(name = "完整地址")
+    private String receivingAddress;
+    @Excel(name = "发放状态")
+    private Integer receivingStatus;
+    @Excel(name = "创建时间")
+    private LocalDateTime createdAt;
+
+    private static final SweetActivityDrawExcelListDao obj = new SweetActivityDrawExcelListDao();
+
+    public static SweetActivityDrawExcelListDao getNew() {
+        try {
+            return (SweetActivityDrawExcelListDao) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetActivityDrawExcelListDao();
+        }
+    }
+
+    public SweetActivityDrawExcelListDao copy(SweetActivityDrawListDao source) {
+        if (null == source) return this;
+        this.setIntegralActivityId(source.getIntegralActivityId());
+        this.setPrizeId(source.getPrizeId());
+        this.setUserId(source.getUserId());
+        this.setReceivingAddress(source.getReceivingAddress());
+        this.setReceivingStatus(source.getReceivingStatus());
+        this.setCreatedAt(source.getCreatedAt());
+        return this;
+    }
+}

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityDrawService;
-import com.liquidnet.service.kylin.dao.OrderExpressExportListDao;
+import com.liquidnet.service.sweet.dto.SweetActivityDrawListDao;
 import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityDrawListSearchParam;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
 import com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper;
@@ -38,7 +38,8 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
     }
 
     @Override
-    public List<OrderExpressExportListDao> selectExpressList(String integralActivityId) {
-        return null;
+    public List<SweetActivityDrawListDao> selectExcelList(String integralActivityId) {
+        List<SweetActivityDrawListDao> sweetIntegralActivityDraws = sweetIntegralActivityDrawMapper.selectExcelList(integralActivityId);
+        return sweetIntegralActivityDraws;
     }
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/SweetActivityDrawListDao.java

+package com.liquidnet.service.sweet.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class SweetActivityDrawListDao implements Serializable {
+
+    private static final long serialVersionUID = 3465116974370295458L;
+
+    private String integralActivityId;
+
+    private String prizeId;
+
+    private String userId;
+
+    private String receivingAddress;
+
+    private Integer receivingStatus;
+
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime createdAt;
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetIntegralActivityDrawMapper.java

 package com.liquidnet.service.sweet.mapper;
 
+import com.liquidnet.service.sweet.dto.SweetActivityDrawListDao;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SweetIntegralActivityDrawMapper extends BaseMapper<SweetIntegralActivityDraw> {
 
+    List<SweetActivityDrawListDao> selectExcelList(@Param("integralActivityId") String integralActivityId);
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetIntegralActivityDrawMapper.xml

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper">
 
+    <select id="selectExcelList" resultType="com.liquidnet.service.sweet.dto.SweetActivityDrawListDao">
+        select a.*
+        from sweet_integral_activity_draw as a
+        left join sweet_integral_activity_prize as b on b.prize_id = a.prize_id
+        left join sweet_integral_activity as c on a.integral_activity_id = c.integral_activity_id
+        <where>
+            <if test="integralActivityId != null  and integralActivityId != ''">
+                and a.integral_activity_id = #{integralActivityId}
+            </if>
+        </where>
+        ORDER BY a.mid DESC
+    </select>
 </mapper>