diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java index 0c15eab5d..e6cdb4185 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java @@ -10,6 +10,7 @@ import com.accompany.admin.service.base.BaseService; import com.accompany.admin.vo.stats.LaborStatsVo; import com.accompany.business.service.room.RoomService; import com.accompany.business.service.user.UsersService; +import com.accompany.common.annotation.FieldComment; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.GsonUtil; @@ -78,7 +79,19 @@ public class LaborStatsAdminService extends BaseService { hallLaborStats.stream() .filter(v -> dateStr != null && dateStr.equals(v.getDate()) && erBanNoToLong.equals(v.getErbanNo())) .findAny() - .ifPresent(laborStats -> BeanUtils.copyProperties(laborStats, stats)); + .ifPresent(laborStats -> { + stats.setFirstInRoom(laborStats.getFirstInRoom()); + stats.setFirstInRoomRetained(laborStats.getFirstInRoomRetained()); + stats.setTotalInRoom(laborStats.getTotalInRoom()); + stats.setFirstInRoomGiftUser(laborStats.getFirstInRoomGiftUser()); + stats.setGiftUser(laborStats.getGiftUser()); + stats.setRoomRevenue(laborStats.getRoomRevenue()); + stats.setRoomNormalRevenue(laborStats.getRoomNormalRevenue()); + stats.setRoomBackpackRevenue(laborStats.getRoomBackpackRevenue()); + stats.setFirstInRoomGiftRate(laborStats.getFirstInRoomGiftRate()); + stats.setNewUserInRoom(laborStats.getNewUserInRoom()); + stats.setNewUserSendGift(laborStats.getNewUserSendGift()); + }); } data.add(stats); }