diff --git a/src/main/java/com/example/demo/domain/entity/UserDetailExport.java b/src/main/java/com/example/demo/domain/entity/UserDetailExport.java index 8910895..cf8c5e9 100644 --- a/src/main/java/com/example/demo/domain/entity/UserDetailExport.java +++ b/src/main/java/com/example/demo/domain/entity/UserDetailExport.java @@ -27,10 +27,10 @@ public class UserDetailExport { private String area; @ExcelProperty("平台信息") @ColumnWidth(20) - private String platformInfo; + private String consumePlatform; @ExcelProperty("更新数量") @ColumnWidth(20) - private BigDecimal count; + private BigDecimal gold; @ExcelProperty("更新类型") @ColumnWidth(20) private Integer updateType; diff --git a/src/main/resources/mapper/DetailYMapper.xml b/src/main/resources/mapper/DetailYMapper.xml index 246e340..ee154f2 100644 --- a/src/main/resources/mapper/DetailYMapper.xml +++ b/src/main/resources/mapper/DetailYMapper.xml @@ -82,10 +82,10 @@ FROM detail_y - - and recharge_coin LIKE '-%' + + AND (recharge_coin LIKE '-%' OR free_coin LIKE '-%' - OR task_coin LIKE '-%' + OR task_coin LIKE '-%') @@ -247,7 +247,7 @@ - SELECT d.detaily_id, u.name, @@ -259,7 +259,8 @@ d.task_coin, d.free_coin, d.create_admin, - d.create_time + d.create_time, + (d.recharge_coin+d.task_coin+d.free_coin) AS gold FROM detail_y d LEFT JOIN