lgy преди 6 години
родител
ревизия
a1f3a4d462
променени са 2 файла, в които са добавени 7 реда и са изтрити 1 реда
  1. 6 0
      src/main/java/com/persagy/controller/OrdinaryController.java
  2. 1 1
      src/main/java/com/persagy/dao/RoomMapper.xml

+ 6 - 0
src/main/java/com/persagy/controller/OrdinaryController.java

@@ -16,8 +16,10 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
+import org.jboss.netty.util.internal.StringUtil;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -26,6 +28,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Created by Admiral on 2018/1/20.
@@ -118,6 +121,9 @@ public class OrdinaryController {
         String date = jsonObject.getString("date");
         List<ReservationVo> list = null;
         list = reservationService.findByRoomId(roomId);
+        if(!StringUtils.isEmpty(date)){
+            list = list.stream().filter(reservationVo->date.equals(reservationVo.getDate())).collect(Collectors.toList());
+        }
         return list;
     }
 

+ 1 - 1
src/main/java/com/persagy/dao/RoomMapper.xml

@@ -15,7 +15,7 @@
         INSERT INTO room(id, name, message) VALUES(null,#{name},#{message})
     </insert>
 
-    <select id="findById" parameterMap="" resultType="com.persagy.domain.Room">
+    <select id="findById" parameterType="int" resultType="com.persagy.domain.Room">
         SELECT * FROM room WHERE id=#{id}
     </select>