夏文涛 2 years ago
parent
commit
41e23f5ae8

+ 1 - 1
mhotel/src/com/happy/action/AppHomePageAction.java

@@ -246,7 +246,7 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
         for (House houseData:houseList) {
         for (House houseData:houseList) {
             BigDecimal todayPrice = BigDecimal.ZERO;
             BigDecimal todayPrice = BigDecimal.ZERO;
             for (String dateStr:dateStrs){
             for (String dateStr:dateStrs){
-                Optional<HousePriceOneDataVo> oneData = oneDatas.stream().filter(e -> e.getHouseId().equals(houseData.getId()) && e.getSetDate().equals(dateStr)).sorted(Comparator.comparing(HousePriceOneDataVo::getCreateDate,Comparator.reverseOrder())).findFirst();
+                Optional<HousePriceOneDataVo> oneData = oneDatas.stream().filter(e -> e.getHouseId().toString().equals(houseData.getId()) && e.getSetDate().equals(dateStr)).sorted(Comparator.comparing(HousePriceOneDataVo::getCreateDate,Comparator.reverseOrder())).findFirst();
                 if(oneData != null && oneData.isPresent()){
                 if(oneData != null && oneData.isPresent()){
                     todayPrice = todayPrice.add(BigDecimal.valueOf(oneData.get().getPrice()));
                     todayPrice = todayPrice.add(BigDecimal.valueOf(oneData.get().getPrice()));
                 }else{
                 }else{

File diff suppressed because it is too large
+ 6 - 6
mhotel/src/com/happy/dao/impl/BookingCommentImplDao.java