Skip to content

Commit cdb03ff

Browse files
c0de8ug-droidc0de8ug-droid
committed
add orderbook review function
1 parent e8880aa commit cdb03ff

30 files changed

+470
-37
lines changed

‎src/com/giit/www/college/controller/OrderBookController.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public String orderBookView(Model m, HttpSession httpSession) {
4444

4545
@RequestMapping("orderbook_review.view")
4646
public String orderBookReviewView(Model m) {
47+
m.addAttribute("notReviewedBookList", orderBookBiz.findAllNotReviewedBook());
4748
return "/teacher/orderbook_review";
4849
}
4950

@@ -76,4 +77,9 @@ public String add(HttpServletRequest request, HttpSession session) {
7677
public void update(@RequestBody ChangedItems changedItems, HttpSession session) {
7778
orderBookBiz.update(changedItems, (String) session.getAttribute("username"));
7879
}
80+
81+
@RequestMapping("audit")
82+
public void audit() {
83+
orderBookBiz.audit();
84+
}
7985
}

‎src/com/giit/www/college/controller/SectionController.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.giit.www.college.service.SectionBiz;
44
import com.giit.www.entity.Section;
55
import com.giit.www.entity.Timetable;
6+
import com.giit.www.util.TermContainer;
67
import org.springframework.stereotype.Controller;
78
import org.springframework.ui.Model;
89
import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +31,7 @@ public String sectionView(Model m) {
3031
public String sectionAddView(Model m) {
3132
m.addAttribute("courseTitleList", sectionBiz.findAllCourseTitle());
3233
m.addAttribute("staffList", sectionBiz.findAllStaff());
34+
m.addAttribute("termList", TermContainer.getTermList());
3335
return "/admin/college/section_add";
3436
}
3537

‎src/com/giit/www/college/dao/BookDao.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<mapper namespace="com.giit.www.college.dao.BookDao">
88

99
<insert id="add" parameterType="Book">
10-
INSERT INTO book(book_title,isbn,data_of_printing,author,press,category,unit_price)
11-
VALUES(#{bookTitle},#{isbn},#{dataOfPrinting},#{author},#{press},#{category},#{unitPrice})
10+
INSERT INTO book(book_title,isbn,date_of_printing,author,press,category,unit_price)
11+
VALUES(#{bookTitle},#{isbn},#{dateOfPrinting},#{author},#{press},#{category},#{unitPrice})
1212
</insert>
1313

1414
<select id="find" parameterType="map" resultType="Book">

‎src/com/giit/www/college/dao/OrderBookDao.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.giit.www.entity.OrderBook;
44
import com.giit.www.entity.custom.AddedBookVo;
55
import com.giit.www.entity.custom.ChangedItems;
6+
import com.giit.www.entity.custom.OrderBookReviewVo;
67
import org.apache.ibatis.annotations.Param;
78

89
import java.util.List;
@@ -18,4 +19,6 @@ public interface OrderBookDao {
1819
public int usedByOtherSec(@Param("bookTitle") String bookTitle, @Param("isbn") String isbn, @Param("secId") int secId);
1920

2021
public void delete(@Param("secId") int secId, @Param("bookTitle") String bookTitle, @Param("isbn") String isbn);
22+
23+
public List<OrderBookReviewVo> findAllNotReviewedBook();
2124
}

‎src/com/giit/www/college/dao/OrderBookDao.xml‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@
66

77
<mapper namespace="com.giit.www.college.dao.OrderBookDao">
88

9+
<resultMap id="orderBookReviewVo" type="OrderBookReviewVo">
10+
<result property="speciality" column="speciality"/>
11+
<result property="courseTitle" column="course_title"/>
12+
<result property="bookTitle" column="book_title"/>
13+
<result property="isbn" column="isbn"/>
14+
<result property="dateOfPrinting" column="date_of_printing"/>
15+
<result property="author" column="author"/>
16+
<result property="category" column="category"/>
17+
<result property="unitPrice" column="unitPrice"/>
18+
<result property="remark" column="remark"/>
19+
</resultMap>
920

1021
<resultMap id="addedBookInfo" type="AddedBookVo">
1122
<result property="secId" column="sec_id"/>
@@ -23,12 +34,11 @@
2334
</resultMap>
2435

2536
<insert id="add" parameterType="OrderBook">
26-
INSERT INTO order_book(staff_id,sec_id,book_title,isbn,remark) VALUES(#{staffId},#{secId},#{bookTitle},#{isbn},#{remark})
37+
INSERT INTO order_book(staff_id,sec_id,book_title,isbn,remark,approval) VALUES(#{staffId},#{secId},#{bookTitle},#{isbn},#{remark},#{approval})
2738
</insert>
2839

29-
3040
<select id="findAddedBookInfoList" parameterType="String" resultMap="addedBookInfo">
31-
SELECT section.sec_id,section.course_title,book.isbn,book.book_title,data_of_printing,author,press,category,unit_price,remark
41+
SELECT section.sec_id,section.course_title,book.isbn,book.book_title,date_of_printing,author,press,category,unit_price,remark
3242
FROM order_book
3343
INNER JOIN book ON order_book.book_title = book.book_title AND order_book.isbn = book.isbn
3444
INNER JOIN section ON order_book.sec_id = section.sec_id
@@ -39,6 +49,16 @@
3949
SELECT count(*) FROM order_book WHERE book_title = #{bookTitle} AND isbn = #{isbn} AND sec_id != #{secId}
4050
</select>
4151

52+
<select id="findAllNotReviewedBook" resultMap="orderBookReviewVo">
53+
SELECT speciality,course.course_title,book.isbn,book.book_title,
54+
date_of_printing,author,press,category,unit_price,remark
55+
FROM order_book
56+
INNER JOIN book ON order_book.isbn = book.isbn AND order_book.book_title = book.book_title
57+
INNER JOIN section ON order_book.sec_id = section.sec_id
58+
INNER JOIN course ON section.course_title = course.course_title
59+
WHERE approval = 0
60+
</select>
61+
4262
<delete id="delete" parameterType="map">
4363
DELETE FROM order_book WHERE sec_id = #{secId} AND book_title = #{bookTitle} AND isbn = #{isbn}
4464
</delete>

‎src/com/giit/www/college/dao/TakesDao.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.giit.www.college.dao;
2+
3+
/**
4+
* Created by c0de8ug on 16-2-16.
5+
*/
6+
7+
public interface TakesDao {
8+
public int getStdCountInSection(int secId);
9+
10+
public void add(int secId, int stdId);
11+
}

‎src/com/giit/www/college/dao/TakesDao.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE mapper
3+
PUBLIC "-//mybatis.org//DTD mapper 3.0//EN"
4+
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5+
6+
7+
<mapper namespace="com.giit.www.college.dao.TakesDao">
8+
9+
<select id="getStdCountInSection" parameterType="int" resultType="int">
10+
SELECT count(student_id) FROM takes WHERE sec_id = #{value}
11+
</select>
12+
13+
</mapper>

‎src/com/giit/www/college/service/OrderBookBiz.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.giit.www.entity.Section;
44
import com.giit.www.entity.custom.AddedBookVo;
55
import com.giit.www.entity.custom.ChangedItems;
6+
import com.giit.www.entity.custom.OrderBookReviewVo;
67
import com.giit.www.entity.custom.OrderBookVo;
78

89
import java.util.List;
@@ -18,4 +19,8 @@ public interface OrderBookBiz {
1819
public List<AddedBookVo> findAddedBookInfoList(String staffId);
1920

2021
public void update(ChangedItems changedItems, String staffId);
22+
23+
public void audit();
24+
25+
public List<OrderBookReviewVo> findAllNotReviewedBook();
2126
}

‎src/com/giit/www/college/service/impl/OrderBookBizImpl.java‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
import com.giit.www.college.dao.BookDao;
44
import com.giit.www.college.dao.OrderBookDao;
55
import com.giit.www.college.dao.SectionDao;
6+
import com.giit.www.college.dao.TakesDao;
67
import com.giit.www.college.service.OrderBookBiz;
78
import com.giit.www.entity.Book;
89
import com.giit.www.entity.OrderBook;
910
import com.giit.www.entity.Section;
1011
import com.giit.www.entity.custom.AddedBookVo;
1112
import com.giit.www.entity.custom.ChangedItems;
13+
import com.giit.www.entity.custom.OrderBookReviewVo;
1214
import com.giit.www.entity.custom.OrderBookVo;
1315
import org.springframework.stereotype.Service;
1416
import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +35,9 @@ public class OrderBookBizImpl implements OrderBookBiz {
3335
@Resource
3436
BookDao bookDao;
3537

38+
@Resource
39+
TakesDao takesDao;
40+
3641
public int ITEMNUM = 8;
3742

3843
@Override
@@ -71,7 +76,7 @@ public void add(OrderBookVo orderBookVo) {
7176
Book book = new Book();
7277
book.setBookTitle(bookTitle);
7378
book.setIsbn(isbn);
74-
book.setDataOfPrinting(dataOfPringting);
79+
book.setDateOfPrinting(dataOfPringting);
7580
book.setAuthor(author);
7681
book.setPress(press);
7782
book.setCategory(category);
@@ -83,6 +88,7 @@ public void add(OrderBookVo orderBookVo) {
8388
orderBook.setStaffId(staffId);
8489
orderBook.setRemark(remark);
8590
orderBook.setSecId(secId);
91+
orderBook.setApproval(false);
8692

8793
orderBookDao.add(orderBook);
8894
bookDao.add(book);
@@ -134,7 +140,7 @@ public void update(ChangedItems changedItems, String staffId) {
134140
Book book = new Book();
135141
book.setBookTitle(newBookTitle);
136142
book.setIsbn(newIsbn);
137-
book.setDataOfPrinting(newDateOfPrinting);
143+
book.setDateOfPrinting(newDateOfPrinting);
138144
book.setAuthor(newAuthor);
139145
book.setPress(newPress);
140146
book.setCategory(newCategory);
@@ -168,4 +174,23 @@ public void update(ChangedItems changedItems, String staffId) {
168174

169175
}
170176

177+
@Override
178+
public void audit() {
179+
180+
}
181+
182+
@Override
183+
public List<OrderBookReviewVo> findAllNotReviewedBook() {
184+
List<OrderBookReviewVo> orderBookReviewVoList = orderBookDao.findAllNotReviewedBook();
185+
Iterator iterator = orderBookReviewVoList.iterator();
186+
while (iterator.hasNext()) {
187+
OrderBookReviewVo temp = (OrderBookReviewVo) iterator.next();
188+
int secId = temp.getSecId();
189+
int stdCount = takesDao.getStdCountInSection(secId);
190+
temp.setStdCount(stdCount);
191+
}
192+
193+
return orderBookDao.findAllNotReviewedBook();
194+
}
195+
171196
}

‎src/com/giit/www/entity/Book.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class Book {
77

88
String bookTitle;
99
String isbn;
10-
String dataOfPrinting;
10+
String dateOfPrinting;
1111
String author;
1212
String press;
1313
String category;
@@ -29,12 +29,12 @@ public void setIsbn(String isbn) {
2929
this.isbn = isbn;
3030
}
3131

32-
public String getDataOfPrinting() {
33-
return dataOfPrinting;
32+
public String getDateOfPrinting() {
33+
return dateOfPrinting;
3434
}
3535

36-
public void setDataOfPrinting(String dataOfPrinting) {
37-
this.dataOfPrinting = dataOfPrinting;
36+
public void setDateOfPrinting(String dateOfPrinting) {
37+
this.dateOfPrinting = dateOfPrinting;
3838
}
3939

4040
public String getAuthor() {

0 commit comments

Comments
 (0)