From bc28bc8475ee70454e9b8546e60e98dacb737c72 Mon Sep 17 00:00:00 2001
From: you <284908631@qq.com>
Date: Tue, 17 Nov 2020 12:15:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/admin/cardborrow.jsp   | 34 ++++++++++----------
 WebContent/admin/cardedit.jsp     | 53 ++++++++++++-------------------
 WebContent/admin/cardlist.jsp     |  1 -
 src/servlet/admin/BorrowList.java |  4 +--
 src/servlet/admin/SortDel.java    |  2 +-
 5 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/WebContent/admin/cardborrow.jsp b/WebContent/admin/cardborrow.jsp
index 03aafa7..e15544e 100644
--- a/WebContent/admin/cardborrow.jsp
+++ b/WebContent/admin/cardborrow.jsp
@@ -59,23 +59,23 @@
     <%
     	System.out.println(Util.getCurrentTimeString());
     %>
-    <% while(resultSet.next()){ %>
-      <%-- 图书超期 --%>
-      <%if(Util.getFormatDateTime(resultSet.getString("end_date")).compareTo(Util.getCurrentTimeString()) < 0 && resultSet.getString("return_date") == null){  %>
-      <tr style="color:#FF5722;">
-      <%} else{ %>
-      <tr>
-      <%} %>
-        <td><%=resultSet.getString("card_id") %></td>
-        <td><%=resultSet.getString("book_id") %></td>
-        <td><%=resultSet.getString("books.name") %></td>
-        <td><%=Util.getFormatDateTime(resultSet.getString("borrow_date")) %></td>
-        <td><%=Util.getFormatDateTime(resultSet.getString("end_date"))%></td>
-        <td><%=resultSet.getString("return_date")!=null?Util.getFormatDateTime(resultSet.getString("return_date")) : "未归还"  %></td>
-        <td><%=resultSet.getString("illegal")!=null?resultSet.getString("illegal"):""%></td>
-        <td><%=resultSet.getString("manager_id")!=null?resultSet.getString("manager_id"):"" %></td>
-      </tr>
-     <%} %>
+	 <% while(resultSet.next()){ %>
+	   <%-- 图书超期 --%>
+	   <%if(Util.getFormatDateTime(resultSet.getString("end_date")).compareTo(Util.getCurrentTimeString()) < 0 && resultSet.getString("return_date") == null){  %>
+	   <tr style="color:#FF5722;">
+	   <%} else{ %>
+	   <tr>
+	   <%} %>
+	     <td><%=resultSet.getString("card_id") %></td>
+	     <td><%=resultSet.getString("book_id") %></td>
+	     <td><%=resultSet.getString("books.name") %></td>
+	     <td><%=Util.getFormatDateTime(resultSet.getString("borrow_date")) %></td>
+	     <td><%=Util.getFormatDateTime(resultSet.getString("end_date"))%></td>
+	     <td><%=resultSet.getString("return_date")!=null?Util.getFormatDateTime(resultSet.getString("return_date")) : "未归还"  %></td>
+	     <td><%=resultSet.getString("illegal")!=null?resultSet.getString("illegal"):""%></td>
+	     <td><%=resultSet.getString("manager_id")!=null?resultSet.getString("manager_id"):"" %></td>
+	   </tr>
+	  <%} %>
     </tbody>
   </table>
 </div>
diff --git a/WebContent/admin/cardedit.jsp b/WebContent/admin/cardedit.jsp
index 3fa82b0..136b21e 100644
--- a/WebContent/admin/cardedit.jsp
+++ b/WebContent/admin/cardedit.jsp
@@ -70,25 +70,25 @@
     </div>
   </div>
   
-  <!-- 借阅规则 -->
-  <div class="layui-form-item">
-    <label class="layui-form-label">规则</label>
-    <div class="layui-input-block">
-      <select name="rule_id" lay-filter="rule_id"  lay-verify="required">
-        <% while(ruleSet.next()){ %>
-          <option value=<%=ruleSet.getString("id") %> <%if(ruleSet.getString("id").equals(infoSet.getString("rule_id"))) out.print("selected"); %>><%=ruleSet.getString("id") %></option>
-        <%} %>
-      </select>
-    </div>
-  </div>
-  
-  <div class="layui-form-item">
-    <label class="layui-form-label">状态</label>
-    <div class="layui-input-block">
-      <input type="radio" name="status" value="1" title="可用" <%if(infoSet.getString("status").equals("1")) out.print("checked"); %>>
-      <input type="radio" name="status" value="0" title="挂失" <%if(infoSet.getString("status").equals("0")) out.print("checked"); %>>
-    </div>
-  </div>
+ <!-- 借阅规则 -->
+ <div class="layui-form-item">
+   <label class="layui-form-label">规则</label>
+   <div class="layui-input-block">
+     <select name="rule_id" lay-filter="rule_id"  lay-verify="required">
+       <% while(ruleSet.next()){ %>
+         <option value=<%=ruleSet.getString("id") %> <%if(ruleSet.getString("id").equals(infoSet.getString("rule_id"))) out.print("selected"); %>><%=ruleSet.getString("id") %></option>
+       <%} %>
+     </select>
+   </div>
+ </div>
+ 
+ <div class="layui-form-item">
+   <label class="layui-form-label">状态</label>
+   <div class="layui-input-block">
+     <input type="radio" name="status" value="1" title="可用" <%if(infoSet.getString("status").equals("1")) out.print("checked"); %>>
+     <input type="radio" name="status" value="0" title="挂失" <%if(infoSet.getString("status").equals("0")) out.print("checked"); %>>
+   </div>
+ </div>
  
   <div class="layui-form-item">
     <div class="layui-input-block">
@@ -118,25 +118,12 @@ layui.use(['form', 'jquery'], function(){
     				anim: 5,
     				time: 500,
     			});
-    			
     			setTimeout(function(){
     				var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
     				parent.layer.close(index); //再执行关闭   
     			}, 500)
-    			/*
-    			parent.layer.open({
-    				title: '注册账号为',
-    				content: data.data['id'],
-    				end: function(){
-    					parent.location.reload();
-    				}
-    			});
-    			*/
-    			/*setTimeout(function(){
-    				parent.location.reload();
-    			}, 500);*/
     		}else{
-    			leyer.msg("添加失败");
+    			leyer.msg("修改失败");
     		}
     	},
     	error: function(){
diff --git a/WebContent/admin/cardlist.jsp b/WebContent/admin/cardlist.jsp
index 926aafd..ea4308e 100644
--- a/WebContent/admin/cardlist.jsp
+++ b/WebContent/admin/cardlist.jsp
@@ -145,7 +145,6 @@
  								  icon: 6,
  								  time: 1500
  							  })
- 							 //obj.del();
  							 // 还是本页数据
  							 $(".layui-laypage-btn").click();
  						  }else{
diff --git a/src/servlet/admin/BorrowList.java b/src/servlet/admin/BorrowList.java
index 342e2b1..1641b0a 100644
--- a/src/servlet/admin/BorrowList.java
+++ b/src/servlet/admin/BorrowList.java
@@ -68,8 +68,8 @@ public class BorrowList extends HttpServlet {
 				where = " where return_date is null and curtime()>end_date ";
 				sql +=where;
 			}
-			sql += " limit ?,?";//1 10  (1-1)*10;
- 			pstmt = connection.prepareStatement(sql);
+			sql += " limit ?,?";
+			pstmt = connection.prepareStatement(sql);
 			pstmt.setInt(1, (Integer.parseInt(page)-1) * Integer.parseInt(limit));
 			pstmt.setInt(2, Integer.parseInt(limit));
 			resultSet = pstmt.executeQuery();
diff --git a/src/servlet/admin/SortDel.java b/src/servlet/admin/SortDel.java
index e368b57..832a9ee 100644
--- a/src/servlet/admin/SortDel.java
+++ b/src/servlet/admin/SortDel.java
@@ -49,7 +49,7 @@ public class SortDel extends HttpServlet {
 				pstmt.setString(1, defaultId);
 				pstmt.setString(2, id);
 				result = pstmt.executeUpdate();
-	
+			
 				// 进行删除
 				sql = "delete from book_sort where id=?";
 				pstmt = connection.prepareStatement(sql);