From 48e4426ece275953b35ec9b975e13e3d73e032e1 Mon Sep 17 00:00:00 2001
From: xicheny <771832800@qq.com>
Date: Sat, 6 Jun 2020 23:04:35 +0800
Subject: [PATCH 1/2] firsttime combine

---
 WebContent/manager/04return.jsp    | 15 ++++++---------
 WebContent/manager/05returnSus.jsp | 25 +++++++------------------
 WebContent/reader/index.jsp        |  4 ++--
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/WebContent/manager/04return.jsp b/WebContent/manager/04return.jsp
index 5474d66..aee639a 100644
--- a/WebContent/manager/04return.jsp
+++ b/WebContent/manager/04return.jsp
@@ -55,13 +55,13 @@
 			<div class="layui-form-item">
 				<label class="layui-form-label">管理员编号</label>
 				<div class="layui-input-inline">
-					<input type="text" name="managerid" lay-verify="required"
-						placeholder="请输入您的编号" autocomplete="off" class="layui-input"><br>
+					<input type="text" name="managerid" readonly="readonly"
+						  class="layui-input" value="<%=session.getAttribute("manager")%>"><br>
 				</div>
 			</div>
 			
 			<div class="layui-form-item" align="center">
-				<button class="layui-btn" lay-submit="" lay-filter="demo2">归还</button>
+				<button class="layui-btn layui-btn-warm" lay-submit="" lay-filter="demo2">归还</button>
 			</div>
 		</form>
 
@@ -77,14 +77,11 @@
 									elem : '#date1',
 									type : 'datetime',
 									format : 'yyyy-M-d H:m:s',
+									min:0,
+									max:0,
 									value: new Date()
 								});
-								laydate.render({
-									elem : '#date2',
-									type : 'datetime',
-									format : 'yyyy-M-d H:m:s'
-								});
-
+								
 								//创建一个编辑器
 								var editIndex = layedit
 										.build('LAY_demo_editor');
diff --git a/WebContent/manager/05returnSus.jsp b/WebContent/manager/05returnSus.jsp
index 3ccf374..a52fcbe 100644
--- a/WebContent/manager/05returnSus.jsp
+++ b/WebContent/manager/05returnSus.jsp
@@ -33,27 +33,16 @@
 						try {
 							int i = ret.executeUpdate(sql);
 							if (i == 1) {
-								String sql4="select * from manager where ID="+managerid;
-								ResultSet rs3=ret.executeQuery(sql4);
-								if(rs3.next()){
-								%>
-									<script>
-										alert('归还成功！');
-										window.location.href = "04return.jsp";
-									</script>
 								
-									<%
 										String sql3="update books set STATUS=1 where ID="+book;
 										ret.executeUpdate(sql3);
-								}else{
-									%>
-									<script>
-										alert('该管理员不存在！');
-										window.location.href = "04return.jsp";
-									</script>
-								
-									<%
-								}
+										%>
+										<script>
+											alert('归还成功！');
+											window.location.href = "04return.jsp";
+										</script>
+									
+										<%
 								
 							} else {
 								%>
diff --git a/WebContent/reader/index.jsp b/WebContent/reader/index.jsp
index 45e66ec..19eca98 100644
--- a/WebContent/reader/index.jsp
+++ b/WebContent/reader/index.jsp
@@ -81,7 +81,7 @@
 		</h1>
 		</header>
 	
-		<div class="main clearfix" style="font-size:10px;margin-top:3%;font-family:YouYuan;">
+		<div class="main clearfix" style="font-size:10px;margin-top:5%;font-family:YouYuan;">
 			<div class="column">
 <%
 		try{
@@ -92,7 +92,7 @@
 %>
 <% int id = rs.getInt(1);%>
 				<p><span class="glyphicon glyphicon-tags">&nbsp;借阅证编号：<%=rs.getString("ID")%></span></p><br>
-				<p><span class="glyphicon glyphicon-pencil">&nbsp;密码：<%=rs.getString("PASSWORD")%></span></p><br>
+				
 				<p><span class="glyphicon glyphicon-user">&nbsp;借阅证姓名：<%=rs.getString("READER")%></span></p><br>
 				<p><span class="glyphicon glyphicon-tag">&nbsp;规则编号：<%=rs.getString("RULE_ID")%></span></p><br>
 				<p><span class="glyphicon glyphicon-star-empty">&nbsp;状态：

From b0d92498b9e4cad6ed9a333a66cfe1cd3b3808dd Mon Sep 17 00:00:00 2001
From: xicheny <771832800@qq.com>
Date: Mon, 8 Jun 2020 08:31:24 +0800
Subject: [PATCH 2/2] finish one table

---
 WebContent/manager/01nav.jsp         |   3 +-
 WebContent/manager/04return.jsp      |   9 +-
 WebContent/manager/05returnSus.jsp   |  19 ++---
 WebContent/manager/06borrowTable.jsp | 123 +++++++++++++++++++++++++++
 WebContent/reader/12rules.jsp        |   8 +-
 src/javabean/Manager.java            |   1 +
 src/servlet/manager/BorrowTable.java | 112 ++++++++++++++++++++++++
 7 files changed, 248 insertions(+), 27 deletions(-)
 create mode 100644 WebContent/manager/06borrowTable.jsp
 create mode 100644 src/servlet/manager/BorrowTable.java

diff --git a/WebContent/manager/01nav.jsp b/WebContent/manager/01nav.jsp
index 781c7f1..1184bab 100644
--- a/WebContent/manager/01nav.jsp
+++ b/WebContent/manager/01nav.jsp
@@ -56,10 +56,11 @@
         <li class="layui-nav-item">
           <a href="javascript:;">报表管理</a>
           <dl class="layui-nav-child">
-            <dd><a href="javascript:;" target="content">借书报表</a></dd>
+            <dd><a href="06borrowTable.jsp" target="content">借书报表</a></dd>
             <dd><a href="javascript:;" target="content">还书报表</a></dd>
           </dl>
         </li>
+        <li class="layui-nav-item"><a href="">发布公告</a></li>
       </ul>
     </div>
   </div>
diff --git a/WebContent/manager/04return.jsp b/WebContent/manager/04return.jsp
index aee639a..a325746 100644
--- a/WebContent/manager/04return.jsp
+++ b/WebContent/manager/04return.jsp
@@ -19,14 +19,7 @@
 		style="margin-left:30%; margin-top: 5%; width: 40%;">
 
 		<form class="layui-form layui-form-pane" action="05returnSus.jsp">
-			<div class="layui-form-item">
-				<label class="layui-form-label">借阅证号</label>
-				<div class="layui-input-inline">
-					<input type="text" name="userid" lay-verify="required"
-						placeholder="请输入借阅证号" autocomplete="off" class="layui-input"><br>
-				</div>
-
-			</div>
+			
 			<div class="layui-form-item">
 				<label class="layui-form-label">图书编号</label>
 				<div class="layui-input-inline">
diff --git a/WebContent/manager/05returnSus.jsp b/WebContent/manager/05returnSus.jsp
index a52fcbe..16357db 100644
--- a/WebContent/manager/05returnSus.jsp
+++ b/WebContent/manager/05returnSus.jsp
@@ -10,17 +10,15 @@
 <body>
 <jsp:useBean id="ret" scope="session" class="javabean.JDBCBean"></jsp:useBean>
 	<%
-		String user = request.getParameter("userid");
+
 		String book = request.getParameter("bookid");
 		String date1 = request.getParameter("date1");
 		String ill = request.getParameter("ill");
 		out.println(ill);
 		String managerid = request.getParameter("managerid");
-		String sql1 = "select * from borrow_card where ID =" + user;
-		
-		ResultSet rs1 = ret.executeQuery(sql1);
+
 		if(session.getAttribute("manager")!=null){
-			if (rs1.next()) {
+
 				String sql2 = "select * from books where ID =" + book;
 				ResultSet rs2 = ret.executeQuery(sql2);
 				
@@ -29,7 +27,7 @@
 					//String id = session.getAttribute("manager").toString();
 					int status=Integer.parseInt(rs2.getString("STATUS"));
 					if(status==0){
-						String sql = "update borrow_books set RETURN_DATE='" + date1 + "',ILLEGAL='" + ill + "',MANAGER_ID='" + managerid + "' where CARD_ID='" + user +"'and BOOK_ID="+ book;
+						String sql = "update borrow_books set RETURN_DATE='" + date1 + "',ILLEGAL='" + ill + "',MANAGER_ID='" + managerid + "' where BOOK_ID="+ book+" order by BORROW_DATE desc  limit 1";
 						try {
 							int i = ret.executeUpdate(sql);
 							if (i == 1) {
@@ -69,14 +67,7 @@
 						<%
 					}
 				}
-			}else{
-				%>
-				<script>
-					alert('用户不存在！');
-					window.location.href = "04return.jsp";
-				</script>
-				<%
-			}
+			
 		}else{
 			%>
 			<script>
diff --git a/WebContent/manager/06borrowTable.jsp b/WebContent/manager/06borrowTable.jsp
new file mode 100644
index 0000000..d67a2a7
--- /dev/null
+++ b/WebContent/manager/06borrowTable.jsp
@@ -0,0 +1,123 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>借阅记录</title>
+	<link rel="stylesheet" href="../public/layui/css/layui.css"  media="all">
+	<style>
+		.layui-table,.layui-table-view{
+			margin: 0 0px;
+		}
+	</style>
+	
+</head>
+<body>
+	<script src="../public/layui/layui.js" charset="utf-8"></script>
+	<!-- 表单 -->
+	<table class="layui-hide" id="cardTable" lay-filter="formFilter"></table>
+	
+	<!-- 头部工具栏 -->
+	<script type="text/html" id="headBar">
+ 		 条件搜索：
+		<div class="layui-inline">
+	  	  <select id="condition" name="condition" lay-verify="required">
+        	<option value=""></option>
+        	<option value="id">ID</option>
+        	<option value="card_id">借阅证号</option>
+			<option value="book_id">图书编号</option>
+        	<option value="borrow_date">借阅日期</option>
+        	<option value="end_date">截止日期</option>
+			<option value="return_date">返还日期</option>
+			<option value="illegal">违章信息</option>
+			<option value="manager_id">处理人</option>
+		  </select>
+	 	 </div>
+  		<div class="layui-inline">
+    		<input class="layui-input" id="conditionValue" name="conditionValue" id="demoReload" autocomplete="off">
+  		</div>
+  		<button class="layui-btn" name="condition" data-type="reload"  lay-event="search">搜索</button>
+	</script>
+	
+
+
+	<script> 
+	layui.use(['table','jquery'], function(){
+	  $ = layui.jquery;
+	  var table = layui.table;
+	  // 进行渲染
+	  var tableIns =  table.render({
+	    elem: '#cardTable'
+	    ,url:'./borrowTable'
+	    ,toolbar: '#headBar'
+	    ,cols: [[
+	      {field:'id', width:80, title: 'ID', sort: true}
+	      ,{field:'card_id', width:180, title: '借阅证号'}
+	      ,{field:'book_id', width:180, title: '图书编号', sort: true}
+	      ,{field:'borrow_date', width:180, title: '借阅日期'}
+	      ,{field:'end_date', title: '截止日期', minWidth: 150}
+	      ,{field:'return_date', width:180, title: '归还时间', sort: true}
+	      ,{field:'illegal', width:80, title: '违章信息', sort: true}
+	      ,{field:'manager_id', width:80, title: '处理人'}
+
+	    ]]
+	    ,page: true
+	  });
+	  
+	  // 头部工具栏事件
+	  table.on('toolbar(formFilter)', function(obj){
+		  var checkStatus = table.checkStatus(obj.config.id);
+		  switch(obj.event){
+		  	// 条件查找图书证
+		    case 'search':
+		      var conditionValue = $('#conditionValue');
+	    	  var condition = $('#condition');
+	    	  layer.msg(condition.val());
+	    	  // 进行搜索，重新渲染
+	    	  tableIns.reload({
+				    where: { //设定异步数据接口的额外参数，任意设
+				    	"condition": condition.val(),
+				    	"conditionValue": conditionValue.val()
+				    }
+				    ,page: {
+				      curr: 1 //重新从第 1 页开始
+				    }
+				  });
+		    break;
+		    // 添加借书证
+		    case 'add':
+		    	var addCardLayer = layer.open({
+		    		type: 2,
+		    		title: '添加借书证',
+		    		area: ['800px', '500px'],
+		  	  	  	maxmin: true,
+		  	  	  	shadeClose: true,
+		  	  	  	content: 'cardadd.jsp',
+		    	});
+		    	//layer.full(addCardLayer);
+		  };
+		});
+	 
+	  // 侧边工具栏事件
+	  table.on(('tool(formFilter)'), function(obj){
+	  	var data = obj.data;
+	  	var layEvent = obj.event;
+	  	var tr = obj.tr;
+	  	switch(obj.event){
+	  	  case 'edit':
+	  	  	  layer.open({
+	  	  	  	type: 2,
+	  	  	  	title: '更改信息',
+	  	  	  	area: ['800px', '600px'],
+	  	  	  	maxmin: true,
+	  	  	  	shadeClose: true,
+	  	  	  	content: '',
+	  	  	  })
+	  	  	break;
+	  	}
+	  })
+	});
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebContent/reader/12rules.jsp b/WebContent/reader/12rules.jsp
index 4ee3e44..428e189 100644
--- a/WebContent/reader/12rules.jsp
+++ b/WebContent/reader/12rules.jsp
@@ -42,9 +42,9 @@ $(function () {
 			while (rs.next()) {
 		if(Integer.parseInt(rs.getString("ID")) % 2== 1){
 %>
-	<button type="button" class="btn btn-lg btn-info" title="可借阅数量：<%=rs.getString("BORROW_NUM") %>"   data-html="true"
+	<button type="button" class="btn btn-lg btn-info" title="可借阅天数：<%=rs.getString("BORROW_NUM") %>"   data-html="true"
 			data-container="body" data-trigger="focus" data-toggle="popover" data-placement="left" 
-			data-content="可借阅图书馆：<%=rs.getString("BORROW_LIBRARY") %><br>过期扣费/天：<%=rs.getString("OVERTIME_FEE") %>" style="width:40%;height:100%;font-size:17px;margin-top:4%;">
+			data-content="可借阅数量：<%=rs.getString("LIMIT") %><br>可借阅图书馆：<%=rs.getString("BORROW_LIBRARY") %><br>过期扣费/天：<%=rs.getString("OVERTIME_FEE") %>" style="width:40%;height:100%;font-size:17px;margin-top:4%;">
 			
 			借阅证规则编号：<%=rs.getString("ID")%>
 		
@@ -52,9 +52,9 @@ $(function () {
 <%
 		}else{
 			%>
-			<button type="button" class="btn btn-lg  btn-primary" title="可借阅数量：<%=rs.getString("BORROW_NUM") %>"   data-html="true"
+			<button type="button" class="btn btn-lg  btn-primary" title="可借阅天数：<%=rs.getString("BORROW_NUM") %>"   data-html="true"
 					data-container="body" data-trigger="focus" data-toggle="popover" data-placement="right" 
-					data-content="可借阅图书馆：<%=rs.getString("BORROW_LIBRARY") %><br>过期扣费/天：<%=rs.getString("OVERTIME_FEE") %>" style="width:40%;height:100%;font-size:17px;margin-top:4%;">
+					data-content="可借阅数量：<%=rs.getString("LIMIT") %><br>可借阅图书馆：<%=rs.getString("BORROW_LIBRARY") %><br>过期扣费/天：<%=rs.getString("OVERTIME_FEE") %>" style="width:40%;height:100%;font-size:17px;margin-top:4%;">
 					
 			借阅证规则编号：<%=rs.getString("ID")%>
 				
diff --git a/src/javabean/Manager.java b/src/javabean/Manager.java
index 2ab3b25..1d2c60f 100644
--- a/src/javabean/Manager.java
+++ b/src/javabean/Manager.java
@@ -29,4 +29,5 @@ public class Manager {
 		}
 		return "账号或密码错误";
 	}
+
 }
diff --git a/src/servlet/manager/BorrowTable.java b/src/servlet/manager/BorrowTable.java
new file mode 100644
index 0000000..e92a4cc
--- /dev/null
+++ b/src/servlet/manager/BorrowTable.java
@@ -0,0 +1,112 @@
+package servlet.manager;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import javabean.Base;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+@WebServlet("/manager/borrowTable")
+public class BorrowTable extends HttpServlet {
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		resp.setContentType("application/json; charset=utf8");
+		// 接收参数
+		String limit = req.getParameter("limit");
+		String page = req.getParameter("page");
+		String condition = (String) req.getParameter("condition");
+		String conditionValue = (String) req.getParameter("conditionValue");
+		String where = ""; // 无限制条件
+		if (page == null) {
+			page = "1";
+		}
+		if (limit == null) {
+			limit = "10";
+		}
+		// 准备查询
+		Connection connection = null;
+		PreparedStatement pstmt = null;
+		PreparedStatement countPstmt = null;
+		ResultSet resultSet = null;
+		ResultSet countSet = null;
+		String sql = "";
+		String countSql = "";
+		// 准备返回参数
+		int code = 1;
+		String msg = "error";
+		int count = 0;
+
+		JSONObject jsonData = new JSONObject();
+		JSONArray jsonArray = new JSONArray();
+		JSONObject jsonResult = new JSONObject();
+		// 进行查询
+		try {
+			connection = (Connection) Base.getConnection();
+			sql = "select * from borrow_books where manager_id is not null";
+			if (condition != null && conditionValue != null && !condition.equals("") && !conditionValue.equals("")) {
+				where = " and " + condition + " like '%" + conditionValue + "%' ";
+				sql += where;
+			}
+			sql += " limit ?,?";// 1 10 (1-1)*10
+			System.out.println("???" + sql);
+			pstmt = connection.prepareStatement(sql);
+			pstmt.setInt(1, (Integer.parseInt(page) - 1) * Integer.parseInt(limit));
+			pstmt.setInt(2, Integer.parseInt(limit));
+			resultSet = pstmt.executeQuery();
+			while (resultSet.next()) {
+				jsonData.put("id", resultSet.getString("id"));
+				jsonData.put("card_id", resultSet.getString("card_id"));
+				jsonData.put("book_id", resultSet.getString("book_id"));
+				jsonData.put("borrow_date", resultSet.getString("borrow_date"));
+				jsonData.put("end_date", resultSet.getString("end_date"));
+				jsonData.put("return_date", resultSet.getString("return_date"));
+				jsonData.put("illegal", resultSet.getString("illegal"));
+				jsonData.put("manager_id", resultSet.getString("manager_id"));
+				jsonArray.add(jsonData);
+			}
+			countSql = "select count(*) as count from borrow_books where manager_id is not null";
+			countSql += where;
+			countPstmt = connection.prepareStatement(countSql);
+			countSet = countPstmt.executeQuery();
+			if (countSet.next()) {
+				count = countSet.getInt("count");
+			}
+			if (!jsonArray.isEmpty()) {
+				code = 0;
+				msg = "查询成功";
+			}
+
+		} catch (ClassNotFoundException e) {
+			msg = "class没找到";
+		} catch (SQLException e) {
+			msg = "sql错误";
+		} finally {
+			try {
+				Base.closeResource(null, pstmt, resultSet);
+				Base.closeResource(connection, countPstmt, countSet);
+			} catch (SQLException e) {
+				msg = "关闭资源失败";
+			}
+
+		}
+		// 返回数据
+		jsonResult.put("code", code);
+		jsonResult.put("count", count);
+		jsonResult.put("msg", msg);
+		jsonResult.put("data", jsonArray.toArray());
+		PrintWriter out = resp.getWriter();
+		out.print(jsonResult.toString());
+	}
+
+}