diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/RoomSovietAdminVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/RoomSovietAdminVo.java index 55b72ddcc..310010f0d 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/RoomSovietAdminVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/RoomSovietAdminVo.java @@ -44,4 +44,8 @@ public class RoomSovietAdminVo { @ApiModelProperty("额外收益发放状态0-未发放,1-已发放") private Byte sendStatus; + @ExcelProperty("国家") + @ApiModelProperty("国家") + private String regionName; + } diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomExtraDiamondDayMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomExtraDiamondDayMapper.xml index 7fd258e04..35214cbbd 100644 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomExtraDiamondDayMapper.xml +++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomExtraDiamondDayMapper.xml @@ -23,6 +23,7 @@ redd.uid uid, u.erban_no erbanNo, u.nick nick, + r.`name` regionName, min(send_status) sendStatus, sum(redd.diamond_num + redd.lucky_diamond_num) diamondNum, sum(redd.room_extra_num + redd.room_extra_lucky_num) extraDiamondNum