Browse Source

添加会议预约详情

lgy 6 năm trước cách đây
mục cha
commit
4114f2a6fe

+ 11 - 1
src/main/java/com/persagy/controller/OrdinaryController.java

@@ -155,7 +155,11 @@ public class OrdinaryController {
         String roomName = jsonObject.getString("roomName");
         int roomId = jsonObject.getIntValue("roomId");
         int userID = jsonObject.getIntValue("userID");
+        int alarmminute = jsonObject.getIntValue("alarmminute");
         String userName = jsonObject.getString("userName");
+        String department = jsonObject.getString("department");
+        String theme = jsonObject.getString("theme");
+        JSONArray enterUsers = jsonObject.getJSONArray("enterUsers");
 
         JSONArray dateArray = jsonObject.getJSONArray("dateArray");
         for (int i = 0; i <dateArray.size() ; i++) {
@@ -171,6 +175,12 @@ public class OrdinaryController {
             reservationCustom.setRoomId(roomId);
             reservationCustom.setMark("待审核");
             reservationCustom.setName(roomName);
+            if(enterUsers != null){
+                reservationCustom.setEnterUsers(enterUsers.toString());
+            }
+            reservationCustom.setTheme(theme);
+            reservationCustom.setDepartment(department);
+            reservationCustom.setAlarmminute(alarmminute);
             reservationService.addReservation(reservationCustom);
         }
 
@@ -336,7 +346,7 @@ public class OrdinaryController {
                 String first = name;
                 jsonObject1.put("name",name);
                 jsonObject1.put("openUserId",openUserId);
-                System.out.println(PinyinUtils.getPinYinHeadChar(name));
+//                System.out.println(PinyinUtils.getPinYinHeadChar(name));
                 jsonObject1.put("first", PinyinUtils.getPinYinHeadChar(name));
                 jsonArray.add(jsonObject1);
             }

+ 9 - 9
src/main/java/com/persagy/dao/ReservationMapper.xml

@@ -11,27 +11,27 @@
     </select>
 
     <select id="findByPaging" parameterType="com.persagy.domain.PagingVO" resultType="com.persagy.domain.ReservationVo">
-        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
+        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
         LEFT JOIN room b on a.room_id=b.id
         WHERE date>DATE_SUB(curdate(),INTERVAL 1 DAY) AND a.mark='待审核' ORDER BY id
         limit #{toPageNo}, #{pageSize}
     </select>
 
     <select id="findAllByPaging" parameterType="com.persagy.domain.PagingVO" resultType="com.persagy.domain.ReservationVo">
-        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
+        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
         LEFT JOIN room b on a.room_id=b.id
         WHERE date>DATE_SUB(curdate(),INTERVAL 1 DAY) AND mark!='取消申请' ORDER BY date DESC
         limit #{toPageNo}, #{pageSize}
     </select>
 
     <select id="findByName" parameterType="string" resultType="com.persagy.domain.ReservationVo">
-        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
+        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
         LEFT JOIN room b on a.room_id=b.id
         WHERE date>DATE_SUB(curdate(),INTERVAL 1 DAY) AND a.mark='待审核' AND a.user LIKE '%${value}%' ORDER BY id
     </select>
 
     <select id="findByRoomId" parameterType="int" resultType="com.persagy.domain.ReservationVo">
-        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
+        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
         LEFT JOIN room b on a.room_id=b.id
         WHERE date>DATE_SUB(curdate(),INTERVAL 1 DAY) AND mark!='取消申请' AND a.room_id=#{id} ORDER BY id
     </select>
@@ -41,14 +41,14 @@
     </select>
 
     <select id="findRecord" parameterType="com.persagy.domain.PagingVO" resultType="com.persagy.domain.ReservationVo">
-        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
+        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
         LEFT JOIN room b on a.room_id=b.id
         WHERE date BETWEEN CURDATE()-30 AND CURDATE() AND a.mark='审核通过' ORDER BY id
         limit #{toPageNo}, #{pageSize}
     </select>
 
     <select id="queryByUser" parameterType="string" resultType="com.persagy.domain.ReservationVo">
-        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
+        SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
         LEFT JOIN room b on a.room_id=b.id
         WHERE date>DATE_SUB(curdate(),INTERVAL 1 DAY) AND a.user LIKE '%${value}%' ORDER BY date DESC
     </select>
@@ -58,12 +58,12 @@
     </update>
 
     <insert id="addReservation" parameterType="com.persagy.domain.ReservationCustom">
-        INSERT INTO reservation(user,mobile,date,begintime,endtime,mark,room_id)
-        SELECT #{user},#{mobile},#{date},#{beginTime},#{endTime},'待审核',id FROM room WHERE name=#{name}
+        INSERT INTO reservation(user,mobile,date,begintime,endtime,mark,room_id,enterUsers,department,theme,alarmminute)
+        SELECT #{user},#{mobile},#{date},#{beginTime},#{endTime},'待审核',id,#{enterUsers},#{department},#{theme},#{alarmminute} FROM room WHERE name=#{name}
     </insert>
 
     <select id="findByUser" parameterType="string" resultType="com.persagy.domain.ReservationCustom">
-        SELECT a.id,b.name,a.user,a.date,a.begintime,a.endtime,a.mark FROM reservation a
+        SELECT a.id,b.name,a.user,a.date,a.begintime,a.endtime,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
         LEFT JOIN room b ON a.room_id=b.id
         WHERE a.date > CURDATE()-15  AND a.mark='待审核' AND a.user=#{value} ORDER BY a.date DESC
     </select>

+ 27 - 0
src/main/java/com/persagy/domain/Reservation.java

@@ -26,6 +26,33 @@ public class Reservation {
     private String mark;
 
     private String enterUsers;
+    private String department;
+    private String theme;
+    private int alarmminute;
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getTheme() {
+        return theme;
+    }
+
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
+
+    public int getAlarmminute() {
+        return alarmminute;
+    }
+
+    public void setAlarmminute(int alarmminute) {
+        this.alarmminute = alarmminute;
+    }
 
     public void setEndTime(Date endTime) {
         this.endTime = endTime;

+ 27 - 0
src/main/java/com/persagy/domain/ReservationVo.java

@@ -29,6 +29,33 @@ public class ReservationVo {
     public String getEnterUsers() {
         return enterUsers;
     }
+    private String department;
+    private String theme;
+    private int alarmminute;
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getTheme() {
+        return theme;
+    }
+
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
+
+    public int getAlarmminute() {
+        return alarmminute;
+    }
+
+    public void setAlarmminute(int alarmminute) {
+        this.alarmminute = alarmminute;
+    }
 
     public void setEnterUsers(String enterUsers) {
         this.enterUsers = enterUsers;

+ 11 - 0
src/main/resources/SpringMvc.xml

@@ -46,5 +46,16 @@
             </set>
         </property>
     </bean>
+    <bean id="utf8Charset" class="java.nio.charset.Charset"
+          factory-method="forName">
+        <constructor-arg value="UTF-8"/>
+    </bean>
 
+    <mvc:annotation-driven>
+        <mvc:message-converters>
+            <bean class="org.springframework.http.converter.StringHttpMessageConverter">
+                <constructor-arg ref="utf8Charset"/>
+            </bean>
+        </mvc:message-converters>
+    </mvc:annotation-driven>
 </beans>