快照调整

src/main/java/com/izouma/nineth/domain/Snapshot.java

@@ -9,9 +9,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import javax.persistence.*;
 
 @Data
 @AllArgsConstructor
@@ -21,16 +19,31 @@ import javax.persistence.Enumerated;
 public class Snapshot extends BaseEntity {
 
     @ApiModelProperty("快照名称")
-    @ExcelProperty("快照名称")
+    @ExcelIgnore
     private String name;
 
     @ApiModelProperty("作用")
-    @ExcelProperty("作用")
+    @ExcelIgnore
     private String rule;
 
     @ApiModelProperty("场景")
-    @ExcelProperty("场景")
     @ExcelIgnore
     @Enumerated(EnumType.STRING)
     private OperationSource source;
+
+    @ExcelProperty("用户id")
+    @Transient
+    private Long userId;
+
+    @ExcelProperty("用户名称")
+    @Transient
+    private String nickName;
+
+    @ExcelProperty("用户手机号")
+    @Transient
+    private String phone;
+
+    @ExcelProperty("持有数量")
+    @Transient
+    private Long countNum;
 }

src/main/java/com/izouma/nineth/dto/SnapshotDTO.java

@@ -6,6 +6,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -13,7 +16,7 @@ import lombok.NoArgsConstructor;
 public class SnapshotDTO {
 
     @ExcelProperty("用户id")
-    private Long userId;
+    private String userId;
 
     @ExcelProperty("用户名称")
     private String nickName;
@@ -22,5 +25,5 @@ public class SnapshotDTO {
     private String phone;
 
     @ExcelProperty("持有数量")
-    private int countNum;
+    private String countNum;
 }

src/main/java/com/izouma/nineth/repo/MetaGameProcessRepo.java

@@ -22,9 +22,7 @@ public interface MetaGameProcessRepo extends JpaRepository<MetaGameProcess, Long
 
     @Query(value = " SELECT m.userId as userId," +
             "u.nickname as nickName," +
-            "u.phone as phone," +
-            "0 as countNum " +
-            "FROM" +
+            "u.phone as phone FROM" +
             "( SELECT user_id userId, sum( point ) point FROM meta_game_process WHERE meta_game_copy_id IN ?2 AND created_at <= ?3 GROUP BY user_id ) m LEFT JOIN USER u ON m.userId = u.id WHERE m.point > ?1 " +
             "AND m.userId NOT IN ( SELECT m.userId userId " +
             "FROM" +

src/main/java/com/izouma/nineth/web/SnapshotController.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.izouma.nineth.config.MetaConstants;
 import com.izouma.nineth.domain.Snapshot;
 import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.dto.SnapshotDTO;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.MetaGameProcessRepo;
 import com.izouma.nineth.repo.SnapshotRepo;
@@ -61,11 +60,8 @@ public class SnapshotController extends BaseController {
             }
             JSONArray jsonArray = new JSONArray();
             jsonArray.addAll(map);
-            List<SnapshotDTO> snapshotDTOS = jsonArray.toJavaList(SnapshotDTO.class);
-            ExcelUtils.export(response, snapshotDTOS);
-        }
-        if (2L == id) {
-
+            List<Snapshot> snapshot = jsonArray.toJavaList(Snapshot.class);
+            ExcelUtils.export(response, snapshot);
         }
     }
 }