完善 admin export

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

@@ -125,8 +125,8 @@
                         var actions = [];
                         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.editTab(\'' + row.integralActivityId + '\')"></i>编辑</a> ');
-                        actions.push(`<a class="btn btn-danger btn-xs ${isOnlineFlag}" href="javascript:void(0)" onclick="openModal('${row.integralActivityId}','${row.isOnline}')"></i>上下线</a>`);
-                        actions.push('<a class="btn btn-warning btn-xs ' + exportExcelFlag + '" href="javascript:void(0)" onclick="exportExcel(\'' + row.integralActivityId + '\')"></i>导出中奖信息</a> ');
+                        actions.push(`<a class="btn btn-danger btn-xs ${isOnlineFlag}" href="javascript:void(0)" onclick="openModal('${row.integralActivityId}','${row.isOnline}')"></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/dto/SweetActivityDrawExcelListDao.java

@@ -16,7 +16,7 @@ public class SweetActivityDrawExcelListDao implements Serializable, Cloneable {
     private String prizeTitle;
 
     @Excel(name = "奖品类型")
-    private Integer prizeType;
+    private String prizeName;
 
     @Excel(name = "数量")
     private Integer prizeTypeNum;
@@ -34,7 +34,7 @@ public class SweetActivityDrawExcelListDao implements Serializable, Cloneable {
     private String receivingAddress;
 
     @Excel(name = "发放状态")
-    private Integer receivingStatus;
+    private String receivingStatusName;
 
     private LocalDateTime createdAt;
 
@@ -51,13 +51,41 @@ public class SweetActivityDrawExcelListDao implements Serializable, Cloneable {
     public SweetActivityDrawExcelListDao copy(SweetActivityDrawListDao source) {
         if (null == source) return this;
         this.setPrizeTitle(source.getPrizeTitle());
-        this.setPrizeType(source.getPrizeType());
+        String prizeName = "";
+        switch (source.getPrizeType()) {
+            case 1:
+                prizeName = "谢谢惠顾";
+                break;
+            case 2:
+                prizeName = "积分";
+                break;
+            case 3:
+                prizeName = "代金券";
+                break;
+            case 4:
+                prizeName = "满减券";
+                break;
+            case 5:
+                prizeName = "优先购买券";
+                break;
+            case 6:
+                prizeName = "实物";
+                break;
+            default:
+                prizeName = "-";
+                break;
+        }
+        this.setPrizeName(prizeName);
         this.setPrizeTypeNum(source.getPrizeTypeNum());
         this.setNickname(source.getNickname());
         this.setReceivingName(source.getReceivingName());
         this.setReceivingPhone(source.getReceivingPhone());
         this.setReceivingAddress(source.getReceivingAddress());
-        this.setReceivingStatus(source.getReceivingStatus());
+        if (source.getReceivingStatus() == 2) {
+            this.setReceivingStatusName("已发放");
+        } else {
+            this.setReceivingStatusName("未方法");
+        }
         this.setCreatedAt(source.getCreatedAt());
         return this;
     }