diff --git a/WebContent/admin/borrowlist.jsp b/WebContent/admin/borrowlist.jsp index 0390704..1a644e5 100644 --- a/WebContent/admin/borrowlist.jsp +++ b/WebContent/admin/borrowlist.jsp @@ -24,6 +24,7 @@
- - - - - diff --git a/WebContent/admin/cardborrow.jsp b/WebContent/admin/cardborrow.jsp index e959efc..ca00f39 100644 --- a/WebContent/admin/cardborrow.jsp +++ b/WebContent/admin/cardborrow.jsp @@ -1,3 +1,9 @@ +<%@page import="javabean.Util"%> +<%@page import="java.sql.PreparedStatement"%> +<%@page import="com.mysql.jdbc.Connection"%> +<%@page import="javabean.Base"%> +<%@page import="java.sql.ResultSet"%> +<%@page import="javabean.JDBCBean"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> @@ -14,53 +20,62 @@ +<% + String id = request.getParameter("id"); + Connection connection = (Connection)Base.getConnection(); + String sql = "select * from borrow_books,books where card_id=? and borrow_books.book_id = books.id"; + PreparedStatement pstmt = connection.prepareStatement(sql); + pstmt.setString(1, id); + ResultSet resultSet = null; + resultSet = pstmt.executeQuery(); + +%>
+ + + + + - - - - + + + + + + + + + <% + System.out.println(Util.getCurrentTimeString()); + %> + <% while(resultSet.next()){ %> + <%-- 图书超期 --%> + <%if(Util.getFormatDateTime(resultSet.getString("end_date")).compareTo(Util.getCurrentTimeString()) < 0 && resultSet.getString("return_date") == null){ %> + + <%} else{ %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + <%} %> + + + + + + + + + <%} %>
人物民族出场时间格言ID书籍ID书籍名借阅时间截止时间归还时间违规信息处理人
贤心汉族1989-10-14人生似修行
张爱玲汉族1920-09-30于千万人之中遇见你所遇见的人，于千万年之中，时间的无涯的荒野里…
Helen Keller拉丁美裔1880-06-27 Life is either a daring adventure or nothing.
岳飞汉族1103-北宋崇宁二年教科书再滥改，也抹不去“民族英雄”的事实
孟子华夏族（汉族）公元前-372年猿强，则国强。国强，则猿更强！ <%=resultSet.getString("card_id") %><%=resultSet.getString("id") %><%=resultSet.getString("books.name") %><%=Util.getFormatDateTime(resultSet.getString("borrow_date")) %><%=Util.getFormatDateTime(resultSet.getString("end_date"))%><%=resultSet.getString("return_date")!=null?Util.getFormatDateTime(resultSet.getString("return_date")) : "未归还" %><%=resultSet.getString("illegal")!=null?resultSet.getString("illegal"):""%><%=resultSet.getString("manager_id")!=null?resultSet.getString("manager_id"):"" %>
diff --git a/src/javabean/Util.java b/src/javabean/Util.java index 1afdf4e..122c239 100644 --- a/src/javabean/Util.java +++ b/src/javabean/Util.java @@ -1,5 +1,7 @@ package javabean; +import java.text.SimpleDateFormat; + public class Util { /** * 主要用来计算json字符串中对象的个数 @@ -11,7 +13,31 @@ public class Util { int count = ( str.length()-str.replace(contain, "").length() ) / contain.length(); return count; } + + /** + * 数据库取出来的datetime有 .0 ,用来去掉 + * @param dateTime + * @return + */ + public static String getFormatDateTime(String dateTime) { + if(dateTime != null && dateTime.indexOf(".0") != -1) { + return dateTime.substring(0, dateTime.length()-2); + }else if(dateTime != null) { + return dateTime; + } + return null; + } + + public static String getCurrentTimeString() { + java.util.Date date = new java.util.Date(); + SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + return dateFormat.format(date); + } + + public static void main(String[] args) { - System.out.println(Util.getCountString("234{sdf{sdf{", "{")); + java.util.Date date = new java.util.Date(); + SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + System.out.println(dateFormat.format(date)); } } diff --git a/src/servlet/admin/BookList.java b/src/servlet/admin/BookList.java index 1f4b760..c521544 100644 --- a/src/servlet/admin/BookList.java +++ b/src/servlet/admin/BookList.java @@ -68,7 +68,6 @@ public class BookList extends HttpServlet { json.put("code", 0); json.put("msg", "success"); json.put("count", map.get("count")); - System.out.println("count: " +map.get("count")); result = "[" +result +"]"; json.put("data", result); } diff --git a/src/servlet/admin/BorrowList.java b/src/servlet/admin/BorrowList.java index db37f94..c87cdb5 100644 --- a/src/servlet/admin/BorrowList.java +++ b/src/servlet/admin/BorrowList.java @@ -55,12 +55,20 @@ public class BorrowList extends HttpServlet { // 进行查询 try { connection = (Connection) Base.getConnection(); - sql = "select * from borrow_books "; + sql = "select id, card_id, book_id, " + + "DATE_FORMAT(borrow_date, '%Y-%m-%d %k:%i:%s') as borrow_date, " + + "DATE_FORMAT(return_date, '%Y-%m-%d %k:%i:%s') as return_date, " + + "DATE_FORMAT(end_date, '%Y-%m-%d %k:%i:%s') as end_date," + + "illegal, manager_id " + + "from borrow_books"; if(condition!=null && conditionValue != null && !condition.equals("") && !conditionValue.equals("")) { where = " where "+ condition +" like '%" +conditionValue +"%' "; sql += where; + }else if(condition!=null && condition.equals("other")) { + where = " where return_date is null and curtime()>end_date "; + sql +=where; } - sql += " limit ?,?";//1 10 (1-1)*10 + sql += " limit ?,?";//1 10 (1-1)*10; pstmt = connection.prepareStatement(sql); pstmt.setInt(1, (Integer.parseInt(page)-1) * Integer.parseInt(limit)); pstmt.setInt(2, Integer.parseInt(limit)); @@ -86,6 +94,9 @@ public class BorrowList extends HttpServlet { if(!jsonArray.isEmpty()) { code = 0; msg = "查询成功"; + }else { + code = 0; + msg = "没有数据"; } } catch (ClassNotFoundException e) {