From 0d779262422e51eee0c014766da2fb3168d05644 Mon Sep 17 00:00:00 2001
From: jinxuesong <jinxuesong@163.com>
Date: Wed, 10 Apr 2019 10:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E8=A1=A8=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/generatorConfig.xml                |   7 +-
 WebContent/jsp/QueryCurriculum.jsp            | 514 ++++++++++--------
 WebContent/jsp/semester.jsp                   |  59 ++
 .../controller/CurriculumController.class     | Bin 4207 -> 3786 bytes
 .../curriculum/mapper/CurriculumMapper.xml    |  25 +-
 .../hrbcu/curriculum/pojo/Curriculum.class    | Bin 1919 -> 2101 bytes
 .../pojo/CurriculumExample$Criteria.class     | Bin 8518 -> 9494 bytes
 .../pojo/CurriculumExample$Criterion.class    | Bin 2304 -> 2304 bytes
 .../CurriculumExample$GeneratedCriteria.class | Bin 14417 -> 15922 bytes
 .../service/CurriculumService.class           | Bin 698 -> 923 bytes
 .../service/CurriculumServiceImpl.class       | Bin 3327 -> 6230 bytes
 .../controller/CurriculumController.java      |  41 +-
 .../curriculum/dao/SpecialityMapper.java      |  30 +
 .../curriculum/mapper/CurriculumMapper.xml    |  25 +-
 .../curriculum/mapper/SpecialityMapper.xml    | 181 ++++++
 .../edu/hrbcu/curriculum/pojo/Curriculum.java |  10 +
 .../curriculum/pojo/CurriculumExample.java    |  60 ++
 .../edu/hrbcu/curriculum/pojo/Speciality.java |  37 ++
 .../curriculum/pojo/SpecialityExample.java    | 390 +++++++++++++
 .../curriculum/service/CurriculumService.java |   6 +-
 .../service/CurriculumServiceImpl.java        |  85 ++-
 .../curriculum/service/SpecialityService.java |  22 +
 .../service/SpecialityServiceImpl.java        |  81 +++
 .../service/TbPermissionServiceImpl.java      |   2 -
 24 files changed, 1315 insertions(+), 260 deletions(-)
 create mode 100644 WebContent/jsp/semester.jsp
 create mode 100644 src/cn/edu/hrbcu/curriculum/dao/SpecialityMapper.java
 create mode 100644 src/cn/edu/hrbcu/curriculum/mapper/SpecialityMapper.xml
 create mode 100644 src/cn/edu/hrbcu/curriculum/pojo/Speciality.java
 create mode 100644 src/cn/edu/hrbcu/curriculum/pojo/SpecialityExample.java
 create mode 100644 src/cn/edu/hrbcu/curriculum/service/SpecialityService.java
 create mode 100644 src/cn/edu/hrbcu/curriculum/service/SpecialityServiceImpl.java

diff --git a/WebContent/generatorConfig.xml b/WebContent/generatorConfig.xml
index 11feb47..580b053 100644
--- a/WebContent/generatorConfig.xml
+++ b/WebContent/generatorConfig.xml
@@ -80,7 +80,7 @@
             <property name="useActualColumnNames" value="false"/>    
         </table>  -->
         
-        <table tableName="tb_user">    
+        <!-- <table tableName="tb_user">    
             <property name="useActualColumnNames" value="false"/>    
         </table>
         
@@ -98,7 +98,10 @@
         
         <table tableName="tb_role_permission">    
             <property name="useActualColumnNames" value="false"/>    
-        </table>
+        </table> -->
         
+         <table tableName="curriculum">    
+            <property name="useActualColumnNames" value="false"/>    
+        </table>
     </context>    
 </generatorConfiguration>  
\ No newline at end of file
diff --git a/WebContent/jsp/QueryCurriculum.jsp b/WebContent/jsp/QueryCurriculum.jsp
index 5b9b9f9..396bac3 100644
--- a/WebContent/jsp/QueryCurriculum.jsp
+++ b/WebContent/jsp/QueryCurriculum.jsp
@@ -9,121 +9,210 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
     <title>实施进程表</title>
-	<link rel='icon' href='<%=request.getContextPath()%>/image/tm.ico ' type=‘image/x-ico’ />
+	<link rel='icon' href='<%=request.getContextPath()%>/images/tm.ico ' type=‘image/x-ico’ />
     <link href="<%=request.getContextPath() %>/js/bootstrap/css/bootstrap.css" rel="stylesheet" type="text/css">
     <link href="<%=request.getContextPath() %>/js/validform/css/style.css" rel="stylesheet" type="text/css">
     <script type="text/javascript" src="<%=request.getContextPath() %>/js/jquery.js"></script>
     <script type="text/javascript" src="<%=request.getContextPath() %>/js/bootstrap/js/bootstrap.js"></script>
     <script type="text/javascript" src="<%=request.getContextPath() %>/js/validform/js/Validform_v5.3.2.js"></script>
-	<script type="text/javascript">	
-		/*删除确认*/
-		function del(courseId) {
-			var flag = window.confirm("确定要删除此数据吗");
-			if (flag) {
-				debugger;
-				location.href = '<%=request.getContextPath()%>/CourseController/DeleteCourse.action?id=' + courseId;
-			}
-		}
-	</script>
-	
-	 <style type="text/css">
-        *{padding: 0px;margin:0px;}
-        .draggable{margin:20px; padding: 20px;}
-        .dropable{margin:20px; padding: 20px;}
-        
-        .table{
-		    table-layout: fixed;
-		    vertical-align: middle;
+    
+    <style>
+	    .over{
+			border: 2px dashed #F00;
 		}
 		
-		.table th, .table td {
-			text-align: center;
-			vertical-align: middle!important;
+		.speical_td{
+			display : none;
 		}
     </style>
     
-    <script type="text/javascript">
-    	var coursetype_id;
-    	
-    	$(function(){
-    		var $tbodys = $("tbody"); //获取网页中所有的tbody元素
-    		var regexp_dnd = /\bdnd\b/;
-    		for (var i = 0; i < $tbodys.length; i++){
-                if (regexp_dnd.test($tbodys[i].className)) 
-                	dnd_func($tbodys[i]);
-            }
-            
-    		function dnd_func(el_tbody){
-    			var original_class = el_tbody.className;
-    			var entered = 0;
-    			
-    			//初始让所有行可以拖
-    			var trs = el_tbody.getElementsByTagName("tr");
-                for (var i=0;i<trs.length;i++) 
-                	trs[i].draggable = true;
-    			
-    			el_tbody.ondragenter = function(e){
-    				el_tbody.className = original_class + " droppable";
-    				console.log(e);
-    			}
-    		}
-    	        
-    		//初始化课程列表中的数据
-    		init_cousertype();
-    		
-    		$('#search').click(function(){
-    			$('#course>tbody').empty(); 
-    			
-    			$.ajax({
-        			url : '<%=request.getContextPath()%>/CourseController/QueryCourseBy.action',
-        			data : {name : $('#coursename').val(),coursetypeid : coursetype_id},
-        			datatype : 'json',
-        			success : function(data){
-        				if(data.length > 0){
-        					for(var i=0;i<data.length;i++){
-    	    					$newElement = $('<tr><td class="id">'+ data[i].id + '</td><td> '+ data[i].name +'</td></tr>');
-    	    					$('#course>tbody').append($newElement);
-        					}
-        					
-        					var lists = document.getElementsByTagName('tbody');
-        			        var regexp_draggable = /\bdraggable\b/;
-        			        var regexp_dropable = /\bdropable\b/;
-        			        for (var i=0;i<lists.length;i++){
-        			            if (regexp_draggable.test(lists[i].className)) 
-        			            	draggable_func(lists[i]);
-        			            
-        			            if (regexp_dropable.test(lists[i].className)) 
-        			            	dropable_func(lists[i]);
-        			        }
-        			        
-        				}else{
-        					
-        				}
-        			}
-        		});
-        	});
-    	});
-    	
-    	function init_cousertype(){
-    		$.ajax({
-    			url : '<%=request.getContextPath()%>/CourseTypeController/QueryAllCoursetype.action',
-    			type : 'post',
-    			datatype : 'json',
-    			success : function(data){
-    				for(var i=0;i<data.length;i++){
-						var coursetype = data[i];
-						$('#coursetype_id').append("<li value="+coursetype.id+"><a onClick='select_coursetype(" + coursetype.id + "," + "\"" + coursetype.name + "\"" + ");'>"+coursetype.name+"</a></li>");
+	<script type="text/javascript">
+		$(function(){
+			$dnds = $('.dnd tr');
+			[].forEach.call($dnds,function(tr){
+				tr.addEventListener('dragstart',handleDragStart,false);
+				tr.addEventListener('dragenter',handleDragEnter,false);
+				tr.addEventListener('dragover',handleDargOver,false);
+				tr.addEventListener('dragleave',handleDragLeave,false);
+				tr.addEventListener('drop',handleDrop,false);
+				tr.addEventListener('dragend',handleDragEnd,false);
+			})
+		})
+		
+		var dragSrcEl = null;
+		var $dragSrcEl = null;
+		var dragSrcTBODY = null;
+		var dropDestTBODY = null;
+		var $dragSrcTBODY = null;
+		var $dropDestTBODY = null;
+
+		function handleDragStart(evt){
+			this.style.opacity = '0.4';
+	
+			dragSrcEl = this;
+			$dragSrcEl = $(this);
+			dragSrcTBODY = this.parentNode;
+			$dragSrcTBODY = $(this.parentNode);
+	 
+			evt.dataTransfer.effectAllowed = 'all';
+			evt.dataTransfer.setData('text/html',this.innerHTML);
+		}
+	
+		function handleDargOver(evt){
+			if(evt.preventDefault){
+				evt.preventDefault();
+			}
+	
+			evt.dataTransfer.dropEffect = 'copy';
+			this.classList.add('over');
+		}
+	
+		function handleDragEnter(evt){
+			this.classList.add('over');
+			dropDestTBODY = this.parentNode;
+			$dropDestTBODY = $(this.parentNode);
+		}
+	
+		function handleDragLeave(evt){
+			this.classList.remove('over');
+		}
+	
+		function handleDrop(evt){
+			if(evt.stopPropagation){
+				evt.stopPropagation();
+			}
+			
+			//在同一张表中移动，不改变颜色
+			if(dragSrcTBODY == dropDestTBODY){
+				dragSrcEl.style.opacity = '1.0';
+				//与当前元素不同
+				if(dragSrcEl != this){
+					dragSrcEl.innerHTML = this.innerHTML;
+					this.innerHTML = evt.dataTransfer.getData('text/html');
+				}
+			}else{//不在统一在表中
+				if($dragSrcTBODY.hasClass('left')){//left ==> right
+					var tr_context = "<tr draggable='true' class='course'>" + evt.dataTransfer.getData('text/html') + "</tr>";
+					var $tr_context = $(tr_context);
+					
+					var $child_tds = $tr_context.children("td");
+					$child_tds.each(function(index,element){
+						$(element).removeClass();
+					})
+					
+					$dropDestTBODY.prepend($tr_context);
+					
+					/////////////////////////////////////////////////////////
+					// 重新为所有的元素绑定事件处理
+					$dnds = $('.dnd tr');
+					[].forEach.call($dnds,function(tr){
+						tr.addEventListener('dragstart',handleDragStart,false);
+						tr.addEventListener('dragenter',handleDragEnter,false);
+						tr.addEventListener('dragover',handleDargOver,false);
+						tr.addEventListener('dragleave',handleDragLeave,false);
+						tr.addEventListener('drop',handleDrop,false);
+						tr.addEventListener('dragend',handleDragEnd,false);
+					})
+					///////////////////////////////////////////////////////
+					// 计算小计各个数据
+					compute_total($dropDestTBODY);					
+				}
+			}
+	
+			return false;
+		}
+	
+		function handleDragEnd(evt){			
+			[].forEach.call($dnds, function (col) {
+			    col.classList.remove('over');
+			});
+			
+			if(dragSrcTBODY == dropDestTBODY){
+				dragSrcEl.style.opacity = '1.0';
+				//与当前元素不同
+				if(dragSrcEl != this){
+					dragSrcEl.innerHTML = this.innerHTML;
+					this.innerHTML = evt.dataTransfer.getData('text/html');
+				}
+			}else{
+				if($dragSrcTBODY.hasClass('right')){//right ==> left
+					$dragSrcEl.remove();
+					compute_total($dragSrcTBODY);
+				}
+			}
+		}
+		
+		function compute_total($whichbody){
+			var total = new Array()
+			var $dest_trs = $whichbody.children('tr');
+			
+			for(var i = 0; i < $($dest_trs[0]).children().length - 1 ; i++){
+				total[i] = 0;
+			}
+			
+			for(var i = 0;i < $dest_trs.length; i++){
+				var $dest_tds = $($dest_trs[i]).children();
+				
+				if(i < $dest_trs.length - 1){//前面的行
+					
+					$dest_tds[4].innerHTML = parseInt($dest_tds[5].innerHTML) + parseInt($dest_tds[6].innerHTML); + "";
+					
+					for(var j = 0; j < $dest_tds.length ; j ++ ){
+						if(j >= 3 && j <= 7){
+							total[j] += parseInt($dest_tds[j].innerHTML);
+						}
 					}
-    			}
-    		});
-    	}
-    	
-    	function select_coursetype(id,content){
-    		$('#coursetype').val(content);
-    		coursetype_id = id;
-    	}
-    	
-    
+				
+					
+				}else{//total 行
+					for(var j = 0; j < $dest_tds.length ; j ++ ){
+						if(j >= 3 && j <= 7){
+							$dest_tds[j].innerHTML = total[j] + "";
+						}
+					}
+				}
+			}
+		}
+		
+		// 保存所有学期的进程表
+		function save_all_data(){
+			for(var s = 1; s <= 8; s++){
+				save_semester_data(s);
+			}
+		}
+		
+		function save_semester_data(no){
+			var trs = $('#semester' + no + ' tbody').find('tr');
+			var curriculums = new Array();
+			for(var i = 0;i < trs.length;i++){
+				var obj = new Object();
+				if($(trs[i]).hasClass('course')){
+					var tds = $(trs[i]).find('td');
+					
+					obj['id'] = 0;
+					obj['specialityid'] = 0;
+					obj['courseid'] = parseInt($(tds[0]).text());
+					obj['semester'] = no;
+					obj['start'] = parseInt($(tds[8]).text());
+					obj['end'] = parseInt($(tds[9]).text());
+					obj['hpw'] = parseInt($(tds[7]).text());
+					obj['sort'] = 0;
+					
+					curriculums.push(obj);
+				}
+			}
+			
+			$.ajax({
+				url : '<%=request.getContextPath() %>/CurriculumController/UpdateCurriculum.action',
+				type: 'POST',
+				data : { semester : no, curriculums : JSON.stringify(curriculums)},
+				datatype : 'json',//后台返回的数据
+				//contentType : 'application/json',
+				success : function(data){
+					console.log("success : " + data);
+				}				
+			}) 
+		}
     </script>
 </head>
 <body>
@@ -178,15 +267,24 @@
 								<thead>
 									<tr>
 										<th style="width: 20%">ID</th>
-										<th style="width: 80%">课程名称</th>
+										<th style="width: 80g%">课程名称</th>
 									</tr>
 								</thead>
-								<tbody class="dnd">
+								<tbody class="dnd left">
 									<c:forEach items="${courses}" var="course">
-						                <tr>
-						                  <td class="id">${course.id }</td>
-						                  <td>${course.name}</td>
-						                </tr>
+						                <tr  draggable="true" class="course">
+											<td class="id">${course.id }</td>
+											<td>${course.name}</td>
+											
+											<td class="speical_td">----</td>
+											<td class="speical_td">${course.score}</td>
+											<td class="speical_td">0</td>
+											<td class="speical_td">${course.theoretical}</td>
+											<td class="speical_td">${course.experiement}</td>
+											<td class="speical_td">0</td>
+											<td class="speical_td">1</td>
+											<td class="speical_td">17</td>
+										</tr>
 						            </c:forEach>			                  
 								</tbody>
 							</table>
@@ -234,7 +332,7 @@
 					                  <th style="width: 5%">结束周</th>
 					                </tr>
 					              </thead>
-					              <tbody class="dnd">
+					              <tbody class="dnd right">
 					              	<tr class="total">
 					              		<td>##</td>
 						              	<td>小计</td>
@@ -278,130 +376,84 @@
 						  </div>
 						  <div role="tabpanel" class="tab-pane" id="semester2">
 						  
-						  <div class="table-responsive">
-								<table class="table table-striped table-bordered">
-					              <thead>
-					                <tr>
-					                  <th style="width: 5%">ID</th>
-					                  <th style="width: 15%">课程名称</th>                                    
-					                  <th style="width: 6%">课程编号</th>                                    
-					                  <th style="width: 6%">学分</th>                                    
-					                  <th style="width: 6%">学期学时</th>
-					                  <th style="width: 6%">理论学时</th>
-					                  <th style="width: 6%">实验学时</th>
-					                  <th style="width: 5%">周学时</th>
-					                  <th style="width: 5%">起始周</th>
-					                  <th style="width: 5%">结束周</th>
-					                </tr>
-					              </thead>
-					              <tbody class="dropable">
-					              	<td>----</td>
-					              	<td>----</td>
-					              	<td>----</td>
-					              	<td>----</td>
-					              	<td>----</td>
-					              	<td>----</td>
-					              	<td>----</td>
-					              	<td>----</td>
-					              	<td>----</td>
-					              	<td>----</td>
-					              
-					              	<c:forEach items="${pageInfo.list }" var="curriculum">
-					                <tr>
-					                  <td>${curriculum.id }</td>
-					                  
-					                  <c:forEach items="${courses}" var="course">	                  	
-										<c:if test="${course.id == curriculum.courseid}">
-					                  		<td>${course.name }</td> 
-					                  		<td>${course.identifier }</td> 
-					                  		<td>${course.score }</td> 
-					                  		<td>${course.theoretical }</td> 
-					                  		<td>${course.experiement }</td> 
-					                  	</c:if>
-					                  	<td>${user.id}</td> 
-					                  </c:forEach>
-					                  
-					                  <td>${curriculum.hpw }</td>                                
-					                  <td>${curriculum.start }</td>                                
-					                  <td>${curriculum.end }</td>                                
-					                  <td>
-					                  	<a href="<%=request.getContextPath()%>/CurriculumController/toUpdateCurriculum.action?id=${course.id}">更新</a>
-					                  	<a href="javascript:del(${course.id});">删除</a>
-					                  </td>
-					                </tr>
-					                </c:forEach>	                
-					              </tbody>
-					            </table>			
-			                </div>
+							  <div class="table-responsive">
+									<table class="table table-striped table-bordered">
+						              <thead>
+						                <tr>
+						                  <th style="width: 5%">ID</th>
+						                  <th style="width: 15%">课程名称</th>                                    
+						                  <th style="width: 6%">课程编号</th>                                    
+						                  <th style="width: 6%">学分</th>                                    
+						                  <th style="width: 6%">学期学时</th>
+						                  <th style="width: 6%">理论学时</th>
+						                  <th style="width: 6%">实验学时</th>
+						                  <th style="width: 5%">周学时</th>
+						                  <th style="width: 5%">起始周</th>
+						                  <th style="width: 5%">结束周</th>
+						                </tr>
+						              </thead>
+						              <tbody class="dnd">
+						              	<td>##</td>
+						              	<td>小计</td>
+						              	<td>----</td>
+						              	<td>0</td>
+						              	<td>0</td>
+						              	<td>0</td>
+						              	<td>0</td>
+						              	<td>0</td>
+						              	<td>----</td>
+						              	<td>----</td>
+						              
+						              	<c:forEach items="${pageInfo.list }" var="curriculum">
+						                <tr draggable="true">
+						                  <td>${curriculum.id }</td>
+						                  
+						                  <c:forEach items="${courses}" var="course">	                  	
+											<c:if test="${course.id == curriculum.courseid}">
+						                  		<td>${course.name }</td> 
+						                  		<td>${course.identifier }</td> 
+						                  		<td>${course.score }</td> 
+						                  		<td>${course.theoretical }</td> 
+						                  		<td>${course.experiement }</td> 
+						                  	</c:if>
+						                  	<td>${user.id}</td> 
+						                  </c:forEach>
+						                  
+						                  <td>${curriculum.hpw }</td>                                
+						                  <td>${curriculum.start }</td>                                
+						                  <td>${curriculum.end }</td>                                
+						                  <td>
+						                  	<a href="<%=request.getContextPath()%>/CurriculumController/toUpdateCurriculum.action?id=${course.id}">更新</a>
+						                  	<a href="javascript:del(${course.id});">删除</a>
+						                  </td>
+						                </tr>
+						                </c:forEach>	                
+						              </tbody>
+						            </table>			
+				                </div>
 						  
 						  </div>
-						  <div role="tabpanel" class="tab-pane" id="semester3">3</div>
-						  <div role="tabpanel" class="tab-pane" id="semester4">4</div>
-						  <div role="tabpanel" class="tab-pane" id="semester5">5</div>
-						  <div role="tabpanel" class="tab-pane" id="semester6">6</div>
-						  <div role="tabpanel" class="tab-pane" id="semester7">7</div>
-						  <div role="tabpanel" class="tab-pane" id="semester8">8</div>
+						  <div role="tabpanel" class="tab-pane" id="semester3">
+						  	<jsp:include page="semester.jsp"></jsp:include>
+						  </div>
+						  <div role="tabpanel" class="tab-pane" id="semester4">
+						  	<jsp:include page="semester.jsp"></jsp:include>
+						  </div>
+						  <div role="tabpanel" class="tab-pane" id="semester5">
+						  	<jsp:include page="semester.jsp"></jsp:include>
+						  </div>
+						  <div role="tabpanel" class="tab-pane" id="semester6">
+						  	<jsp:include page="semester.jsp"></jsp:include>
+						  </div>
+						  <div role="tabpanel" class="tab-pane" id="semester7">
+						  	<jsp:include page="semester.jsp"></jsp:include>
+						  </div>
+						  <div role="tabpanel" class="tab-pane" id="semester8">
+						  	<jsp:include page="semester.jsp"></jsp:include>						  						  
+						  </div>
 						</div>
-					
-					
-					
-					
-					
-						<%-- <div class="table-responsive">
-							<table class="table table-striped table-bordered">
-				              <thead>
-				                <tr>
-				                  <th>ID</th>
-				                  <th>课程名称</th>                                    
-				                  <th>课程编号</th>                                    
-				                  <th>学分</th>                                    
-				                  <th>学期学时</th>
-				                  <th>理论学时</th>
-				                  <th>实验学时</th>
-				                  <th>周学时</th>
-				                  <th>起始周</th>
-				                  <th>结束周</th>
-				                </tr>
-				              </thead>
-				              <tbody>
-				              	<c:forEach items="${pageInfo.list }" var="curriculum">
-				                <tr>
-				                  <td>${curriculum.id }</td>
-				                  
-				                  <c:forEach items="${courses}" var="course">	                  	
-									<c:if test="${course.id == curriculum.courseid}">
-				                  		<td>${course.name }</td> 
-				                  		<td>${course.identifier }</td> 
-				                  		<td>${course.score }</td> 
-				                  		<td>${course.theoretical }</td> 
-				                  		<td>${course.experiement }</td> 
-				                  	</c:if>
-				                  	<td>${user.id}</td> 
-				                  </c:forEach>
-				                  
-				                  <td>${curriculum.hpw }</td>                                
-				                  <td>${curriculum.start }</td>                                
-				                  <td>${curriculum.end }</td>                                
-				                  <td>
-				                  	<a href="<%=request.getContextPath()%>/CurriculumController/toUpdateCurriculum.action?id=${course.id}">更新</a>
-				                  	<a href="javascript:del(${course.id});">删除</a>
-				                  </td>
-				                </tr>
-				                </c:forEach>	                
-				              </tbody>
-				            </table>			
-		                </div> --%>
-		                
-		                
-		                
-		                
-		                
-		                
-		                
-		                <!-- 包含分页文件 -->
-		                <%-- <jsp:include page="Pager.jsp"/>
 		                
-		                <a href="<%=request.getContextPath()%>/jsp/AddCurriculum.jsp" class="btn btn-primary btn-block">增加课程</a> --%>
+		                <button type="button" class="btn btn-success" onclick="save_all_data();">保存修改</button>
                 
                 </div><!-- panel-body -->
             </div>
diff --git a/WebContent/jsp/semester.jsp b/WebContent/jsp/semester.jsp
new file mode 100644
index 0000000..eb7fb0d
--- /dev/null
+++ b/WebContent/jsp/semester.jsp
@@ -0,0 +1,59 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<div role="tabpanel" class="tab-pane active">
+	<div class="table-responsive">
+		<table class="table table-striped table-bordered">
+			<thead>
+				<tr>
+					<th style="width: 5%">ID</th>
+					<th style="width: 15%">课程名称</th>
+					<th style="width: 6%">课程编号</th>
+					<th style="width: 6%">学分</th>
+					<th style="width: 6%">学期学时</th>
+					<th style="width: 6%">理论学时</th>
+					<th style="width: 6%">实验学时</th>
+					<th style="width: 5%">周学时</th>
+					<th style="width: 5%">起始周</th>
+					<th style="width: 5%">结束周</th>
+				</tr>
+			</thead>
+			<tbody class="dnd right">
+				<tr class="total">
+					<td>##</td>
+					<td>小计</td>
+					<td>----</td>
+					<td>0</td>
+					<td>0</td>
+					<td>0</td>
+					<td>0</td>
+					<td>0</td>
+					<td>----</td>
+					<td>----</td>
+				</tr>
+
+				<c:forEach items="${pageInfo.list }" var="curriculum">
+					<tr>
+						<td>${curriculum.id }</td>
+
+						<c:forEach items="${courses}" var="course">
+							<c:if test="${course.id == curriculum.courseid}">
+								<td>${course.name }</td>
+								<td>${course.identifier }</td>
+								<td>${course.score }</td>
+								<td>${course.theoretical }</td>
+								<td>${course.experiement }</td>
+							</c:if>
+							<td>${user.id}</td>
+						</c:forEach>
+
+						<td>${curriculum.hpw }</td>
+						<td>${curriculum.start }</td>
+						<td>${curriculum.end }</td>
+					</tr>
+				</c:forEach>
+			</tbody>
+		</table>
+	</div>
+</div>
diff --git a/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class b/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class
index b401fa4bb0460e573a18b771d1c9711e091082b6..973a3c50a612b072d95b0cd4c423566264d6449e 100644
GIT binary patch
delta 1486
zcmah}SyLQU6#ni^&-4t_Y(qdM2}@XH8K6S~B+iJM5Dh30$N&joBu#S}8fT+#H-g)^
z#3gD<sebd_SBoSTgi4jKR$1k*@Y(VoSf1_~aC`7!?m73K^PTgZ@AjSFTYqla|CU8+
zMS<&vmNBf|z0LTU)X6Tz&22;HNrp;mbzX4Oky$)AS8~5$ZNYj4wTM1`!XB}%E(HMu
zE6{_uj9!M?O>J9KGg>aKPUI|}=B9!^^gDb0y0D5t8Rr=Wovm==-h)^`!3A7&e)SJj
z4J!zvB7#eJPR3=YMY`ZmAnD9W@!C-Z5hxM7h$}K)VifhzA!lDY?Y~M%zep|Yn)92~
zer^n}xYVvQ)OAmKL~P5*sFQ}Ul06GDCY-^*VAnY6LzrYZrEZFXI%{)tcg!|TL$@<_
zwgTgrR&WC|&iz1l!%c=zK}++A+<M*(%_*42g7Z^=58Y;v^}KBgE<#vhi1HmRYveS`
z$mg=$+Q_fb`Rir;ifv{>c;oTipzL#QM(P@7%LM<fRC3v=WijWEaE;RuuJ3GA=L>6^
z#s4BVpy_UPhG3}y!zJfoC|<W^b74(+J?Yk@nH#A&=lf8S4ZG2z7rmNa+f7!$!nO>X
zp*e4+Rjr`u8(b9|hM8AWT(?d77UoGYq2Mj-FjS<um9keixo$CZboWgD2PH~TwVag<
z<88bv;~j>Y;}4;jR#Use;#mdn;e7^w-ll5xrTa1R>WpdRtdwPPElUJHz(+DZqzm-m
z{|qbm823o^f{VzI3{v+*&q4^F5>sL8Iu~Ny&XD4QXGsulGDLK{^7v{6L+`P|(SEs1
zouTdj$8x@l?682-tc(_Ys6-Wr1%M#g5Lq9pQS+}eKkez2&{{_sDp^K0(0hne4?Rc&
zt!@FJ70=MBloHU080{EN;|%;>8@JtA`ZX<s6$P5nLJ19S!B)y>5;%vpCA6bMpwsQf
zI?KRx?+<u3et_;H4EQibyP+eDFiey8{1IMYNJvjHw%B)wmlJ`f7+*ZZtBGJN7=7&k
zQ)Fgifdiy&k$0=V<P@WeF{ymE9KBQW_KA-l?mz?dR^7FVCT_%eA~lG9T*L^5Fp6PZ
zCvS#c`4TQ;4GC}Xac{_Ud2k?2^Q_QtRanGbXryi<y~o?+`O#j)H3DmpsB8kO(CP1I
zgqo~@lbY+)yq97nX!-=Y;X*y6ae~|=B*UA?l*Kwr+3wF(Ss;rXS&lpk*rKYg<dr_s
zA0~OsTiuIYA%sM>`U%AJBkcD5cz|N`6IT(Rr$`l*2N9KsqCznDs$Gf%IhnW`pLr9z
iXP@J~S2BVx@Fih=_{yvGz*8ye+^LZx#~*{h*M9=iay1kH

literal 4207
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
Rqx$?5x75$PuTSnT{{b$OdTIaw

diff --git a/build/classes/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml b/build/classes/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml
index cebda36..72bbd56 100644
--- a/build/classes/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml
+++ b/build/classes/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml
@@ -9,6 +9,7 @@
     <result column="start" jdbcType="INTEGER" property="start" />
     <result column="end" jdbcType="INTEGER" property="end" />
     <result column="hpw" jdbcType="DOUBLE" property="hpw" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -69,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, specialityid, courseid, semester, start, end, hpw
+    id, specialityid, courseid, semester, start, end, hpw, sort
   </sql>
   <select id="selectByExample" parameterType="cn.edu.hrbcu.curriculum.pojo.CurriculumExample" resultMap="BaseResultMap">
     select
@@ -104,10 +105,10 @@
   <insert id="insert" parameterType="cn.edu.hrbcu.curriculum.pojo.Curriculum">
     insert into curriculum (id, specialityid, courseid, 
       semester, start, end, 
-      hpw)
+      hpw, sort)
     values (#{id,jdbcType=BIGINT}, #{specialityid,jdbcType=BIGINT}, #{courseid,jdbcType=BIGINT}, 
       #{semester,jdbcType=INTEGER}, #{start,jdbcType=INTEGER}, #{end,jdbcType=INTEGER}, 
-      #{hpw,jdbcType=DOUBLE})
+      #{hpw,jdbcType=DOUBLE}, #{sort,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="cn.edu.hrbcu.curriculum.pojo.Curriculum">
     insert into curriculum
@@ -133,6 +134,9 @@
       <if test="hpw != null">
         hpw,
       </if>
+      <if test="sort != null">
+        sort,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -156,6 +160,9 @@
       <if test="hpw != null">
         #{hpw,jdbcType=DOUBLE},
       </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="cn.edu.hrbcu.curriculum.pojo.CurriculumExample" resultType="java.lang.Long">
@@ -188,6 +195,9 @@
       <if test="record.hpw != null">
         hpw = #{record.hpw,jdbcType=DOUBLE},
       </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -201,7 +211,8 @@
       semester = #{record.semester,jdbcType=INTEGER},
       start = #{record.start,jdbcType=INTEGER},
       end = #{record.end,jdbcType=INTEGER},
-      hpw = #{record.hpw,jdbcType=DOUBLE}
+      hpw = #{record.hpw,jdbcType=DOUBLE},
+      sort = #{record.sort,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -227,6 +238,9 @@
       <if test="hpw != null">
         hpw = #{hpw,jdbcType=DOUBLE},
       </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -237,7 +251,8 @@
       semester = #{semester,jdbcType=INTEGER},
       start = #{start,jdbcType=INTEGER},
       end = #{end,jdbcType=INTEGER},
-      hpw = #{hpw,jdbcType=DOUBLE}
+      hpw = #{hpw,jdbcType=DOUBLE},
+      sort = #{sort,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/Curriculum.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/Curriculum.class
index 5c8ce55c80991ba7ca4c506f1bb1ed8e99968dc7..c46a17cac714d3ac1aedb81515b4060de3697ca6 100644
GIT binary patch
literal 2101
zcma)+ZBG+H5XWa*`an4>mInnz1qE6V4ir!Xs#rj3D#ld${(9Y%Bjt|VgGN7<CK?l8
z_yPP-#+kiBuj^hS2{(7U|Nri9W_J7g&(B`~untEVNHAD1ZJoCQ{nTxmfo=w_YneeO
zIM*+nGe@sneP>{R!N{5M!O%N~-PYeW&$#JlAkAP*j9QLf=dNXRtj|WX!x<#37CLG@
zOU<#{+YB`Cf}5oCKanD9I)UqP@#^t&?)lthFdFeyZJ)Qfi`JCq8?MhF$!&BdPcJ?)
zC`6R|PJmmZaKLj&H{uDR26sKnu}`Y|4A^T1!xhKIm2AIZbON5jYS15JklwLu%P-^7
z#Zm)TsW>g3gCyM2;0D}ekgr)bKMu~D+<hM=S*SUt(P<c%IPTmX9Pm#qk3p&SpS7jT
z+T5>VPK9DAl8>m^ATYSEK?br^fKWDClvTu=$3^Oq;*ztd!5}&F=#0)W7(#WWTYFMI
z)F4O7Ayi(DhpPHjTgLnFE*nGcH4TP93*9~aM3nPVPN-QzrDl?MQ-fjhW{ENEa2n?i
z>=w;F)8HD-rg0XB@CE0NsP$ugG~MQt<+%oV7zr&xIUeQc3JD`a7<g33w6DQ++9yL4
z;`rq1SRRufT6CQAy}PhNXBuYElf?fN7C1re!84SgVvC5S6cLLeA|@yzrXnKpiHKWb
zoPq+3;#y;3Y#c!toj80>;)srsVN5OlfT^!SavPuNa1f^PUF*KzfxGy{;GV$iH-CfK
zFOqpuX?_56xCEKYm{9^_dU5GH%=Wg<iP34y{f<~+B2?iQZBJ-a52Bt|f-J}&GfI$>
z8e~BRnM08I7!Ya*fh;OPmSm8U5@cBovLu5nBgje&2%QK5SrPq|TeB*ItSLbr!DC$F
zpVq9(AR7p>83RH`l0ep#AR98smJ;NN8e~HT*+r0Y3<%u`0(q(g*^)u_lpxz`kS!VH
z06`98K<H8u$PVn{Q*KRJ2B|7RUcg@0+;?lrGRPYQIgSCLUj+hrsjNsv26?9hIZ#)m
WB7>YDNFxS>ewGO25HE8AUi}3SL?rnD

literal 1919
zcma)+YflqF6o${V^g>xImYV{K2tqH&s#HO_sjU~Z(GS&r-)<-ElCn$oqS0TaiN?ea
z{s4cJ@toO(ZpUe2lkS<$yzk6&&YA7+KR<r~Kox2kNHEwiZJl=lz2~;gKsN)|walO&
zoa$%JiKEvperI5e!PJTI!O;7L-PPZ=Pq^u4AkAP#%vz4#<gR7(t<Ofg&lx1F4muhG
zOT)3ddki%1jGLtMKanD9I)UqPG4%K;_k8X$n2!05ZJ&3!i`JCq8?MhF$!&BdduJaR
z6k^J{6X4M(obm)pi@ToX*zb?)4A?6MlQqZ2Eo{GK^aGy4GSG)HNbg&=<sagn#ZrsG
zSk3A193){ugE^RIkZ)Kve-oUxx%)26uF!Byqu(+xV>~jN9P@jY$Dq{s&!SRFUG5)a
zGKFF(mWU|TI54=WK?bsvc_^DM$|~Z`<0j2mRmr)b!8ked=!~y1m_T(cDmp1E8stbh
zfy(pwP}RKX$LtW^c}K{7M}rB_Lia#F7w0^e6Ka-Fsf*;jufZgFv&0y-HjV4g><+Cy
z)Zh}Wrg0UgaDZzsspm68G*Q>da;QNbrb3HQ&c-<+Az|d2SOAkhx9Fzk2iJUyt}CqI
zR!RJ(APWg<0N#=Wl~Y74mWY_Ph?s(i2rD8IU|fL9P{2K=#oP>XF}h3myn-`2Muss}
z{sC9N3dtfq)8Qm6;aH2t*Wfz-Vz3N1@HuS$1}k4A^Ssi$3Tu)15Hm^8QRT{aSQ#9h
z6SIq$^OD$ME>uByJfTq?i29ZiWL*YXR)Q4OAnP*7DuS$y0HH<@NJ$A&mO(a@Ae(BC
zvJ6r|kj)VwbQ1{VHf-TjZjCO3=t_{ga4#|swMLggwh^Q{0)(z2fov;5sxruq66Apz
zq$-2#A;|s+5PBB~WJd|ID}x*<K_00=c4d$ng49QV(91|5dx-jPYYt?P7fO&LcpRCB
XT5}+Syhf152oU-=Adn~GJ$?EYu5c72

diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criteria.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criteria.class
index e1392732f1d46a61c96ed638dd8a13cdf0551d3c..f4860f3e0e7ad6244f600a82e5ec582a676440ee 100644
GIT binary patch
literal 9494
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

literal 8518
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

diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criterion.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criterion.class
index 128ca997eb59319f83e3fae3a2db788397c3f467..491ad7289ececa9266a784594a222994630cc796 100644
GIT binary patch
delta 193
zcmZn=Y7pA6jfF9FvLUPJ<TEVljG15-C#yPRE|6uzSP14f1No(3)&U@^63qGwWYvOM
zR&45wjX;+0<We>Z!Bz$qrZxsnrgjECrVa*Srq0Rx*fJG+fTF!X(LSJPKTvc6gA~(5
z26?7Q3`$Is8Pu7kPWE80WSzml&NOrKG4?FUIY9Muf$HZ0)z1g2U%(*Aw2(oLY0+d)
RjtthN3>-|$CU4{L0st`<E_VO`

delta 193
zcmZn=Y7pA6jfGKjvLUPJ<TEVljJjYJC#yQ6A&_OmXbR>x1NoL<)&U^P7R>q!WI2La
zR&45wu0WRX<We>ZK~Dx2CNBm~CT|8lCLac2Cf~{X*fJFZfTDpw(IB8`Fi<pvL5eAq
zL7pj$L5V4xL7gdbvIl!5YYYQBQ|#np>{*ftK=p}0^+`bW$w2if43bQ#4023qlRY^y
PSTh+on6f5s<M09i!96Cs

diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$GeneratedCriteria.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$GeneratedCriteria.class
index aa4ed4ce54ed1b2daf56b7107813bc71d25eab1d..2b8c600435a417d9105b682e5cd96c4d15d14b77 100644
GIT binary patch
delta 852
zcmZvaO-~bH5P)ZvmX=VZD=BS&hMM33O4}eDFtn9G5J?EefCrB?ZjhwewcRCtAr(JB
zML~SQZ$&}88G_zC_yf4{6Z{FBO$@Wsce`LX&F(zU%scPw?q2^f9o+f%>o)*&<2N5D
z2z}zDlG;Ao8ZI5n=~u^$qBU%ePUZ7{yp0er={+`S#&pUc1YN_h%F<oRRwToc;&CYs
z7N&Cfal?=I5UN?r`0+l1$9_gor8a6<gN0tHK0@%Zn$9Aekj79^%UN1+{8~=;<71~8
z2~8}BJvCBVa0;^-ggRL`qM2s7YSF1mBSikA7mAfhmz^$Y>QW=UVLEli0h2l{Mgp4L
zX0H)yM|fzRc3=z62KqJYhNhA7&e`Uba^}$OE7nK3PH`zb;8{mV($`6fo$xuF_^C$1
zu`0xyVmBVbTVgHVP^|>Pr>J5t6~a55o-U_Dly2bkj3^{R-cr0CXT_fcRWw4a(j+b>
zTJQm*hc0R%6k{~UXx>GwgibMf!sw}s+6c8XddBFvi;{#=jFuR^a8VbbZbmOfG#T{@
zMq5#uu!qnYv3$A{R~fx>QHD^~M$K>FFVNEIM;-$&R8dsh>+x;8!@lTN7q#h!fHEMk
yCnCP5)aLg``X3JXL*$>AeqEb_pQxvTYxtRBBb{&=zu*ScKnKOI6p`YlC$JA~72gp6

delta 95
zcmdl~bFo0+)W2Q(7#J8#7#r9bm>3xxCMz=OZ?sntpUfv|%2LC~pa&Gtn_MdC#u&YM
skEFPQCKF=?P(2f4C1VwkmSSLLh-9p0tYzS2&;inQK$;Oq*R${d0GO2&Bme*a

diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumService.class b/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumService.class
index 9a78ff8842e6e816e767d327e7ec89965e03509d..8769c8bf1a7476ca7ff67aadd79a04b7c8c7aaa8 100644
GIT binary patch
delta 289
zcmdnRI-8yA)W2Q(7#J8#7$i4x?O>dIl`(trAx7bPH4UGv#Ii*FoW#6zeV_cibZbu}
zf#8y&OrVgaCnJMsacWL#a*1<kQBh`cX-;XbXG*bCB_o3|E(1zSGIR8OGK)*BH6bP<
z1Q;2@p}KrA?1ihcL2?J!VRje>p(~ke&1AyJKDmHNS66_6k%1HFUnT}Y7Dfgk24MyU
RAT7cm3Ktgxvc$nEBmf=uR3HEV

delta 91
zcmbQuzKd1h)W2Q(7#J8#7)03_m>3xhCo?ihY}A;=C@4@`kdj!E>Reh>l$l(bQ<^*Z
q0AucCL1ukMw#kmny0UBx3@nTc0t|u-j0~JW6POr;fGlA!O9TK%-4a>=

diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.class
index be353e00d8dc952368f12c539b6ccc72484ec2db..079aa3ac39771413775061dae84bfd395024cd79 100644
GIT binary patch
literal 6230
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

delta 593
zcmX|7O>YuW6g`gth8aO-#D0)sEvYDCld(#p3AK$iEJ)h8pi*0__A!i>b_TG_U|r!)
z(A=dfS8iO`#HiK8x>fh?{R!?|sW*_Amv=wTyXTzu-j9oa)5f<yA3p;qVqZl_VD7n`
zr8gpcQ2r9lA43|eaoj>pU_9tFr0*;}Dep_K<2qHxb!@-ca|AZ&dbB{lv^*V!HBq4h
z%{zAocU5c(r0tgFGy-dTuWkoc;5Xf_b))Th?N%K3aG%QhnW%)VqE2mnG}8d<#hNX@
zCf$HbC4au6;~|<Vw&|swQ+BXRU-iX|s0f7JX4e-mmUm=N4z#UhMoP4$O^6cx)Jldx
zqUuX~cSUwqW!-h?Y4Vv+$utVWq<LdWq^WPXiAlt88VO8c99jBpY(&oDIP$b+-V`(R
z%FOmhz*78AH7LA*lb<lX{vNrN!dr}9m^nmM!E44tFgWU*fmv3)1e2?&AqOXr;*Qxk
zg-KS7A&z-m<7t64+~%C+(-77NUWd$za9^BwK}V^Gy73NMAMk*_r{?-s5XMy`QNkE2
zWLP7I1$JB<_!Wn||9(Zd@YrLFeTRM-e(3^FE6h>QLYwtE>=oy!A@YckJw_CWB!}+c
XVm>s^QH%%#T=aPB%(#qcJcjlUM-gpe

diff --git a/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java b/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java
index fa13b4c..cadee4a 100644
--- a/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java
+++ b/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java
@@ -3,9 +3,13 @@ package cn.edu.hrbcu.curriculum.controller;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
@@ -15,10 +19,13 @@ import com.github.pagehelper.PageInfo;
 import cn.edu.hrbcu.curriculum.pojo.Course;
 import cn.edu.hrbcu.curriculum.pojo.Curriculum;
 import cn.edu.hrbcu.curriculum.pojo.Examinationmethod;
+import cn.edu.hrbcu.curriculum.pojo.Speciality;
+import cn.edu.hrbcu.curriculum.pojo.TbUser;
 import cn.edu.hrbcu.curriculum.service.CourseService;
 import cn.edu.hrbcu.curriculum.service.CurriculumService;
 import cn.edu.hrbcu.curriculum.service.ExaminationmethodService;
-import cn.edu.hrbcu.curriculum.pojo.Curriculum;
+import cn.edu.hrbcu.curriculum.service.SpecialityService;
+import cn.edu.hrbcu.curriculum.service.TbUserService;
 
 @Controller
 @RequestMapping("/CurriculumController")
@@ -29,6 +36,10 @@ public class CurriculumController {
 	CourseService courseService;
 	@Autowired
 	ExaminationmethodService examinationmethodService;
+	@Autowired
+	private SpecialityService specialityService;
+	@Autowired
+	private TbUserService tbUserService;
 	
 	@RequestMapping("/QueryCurriculum.action")
 	public ModelAndView QueryCurriculum(@RequestParam(value = "currentPage",required=false, defaultValue="1") Integer currentPage){
@@ -47,7 +58,7 @@ public class CurriculumController {
 		return modelAndView;
 	}
 	
-	@RequestMapping("/QueryAllCurriculum.action")
+	/*@RequestMapping("/QueryAllCurriculum.action")
 	@ResponseBody
 	public Object QueryAllCurriculum(){
 		List<Curriculum> list = curriculumService.selectCurriculums(-1);		
@@ -79,12 +90,28 @@ public class CurriculumController {
         modelAndView.addObject("curriculum", curriculum);
         
 		return modelAndView;
-	}
+	}*/
 	
-	@RequestMapping("/UpdateCurriculum.action")
-	public Object UpdateCurriculum(Curriculum curriculum){
-		int cnt = curriculumService.updateCurriculum(curriculum);
+	@RequestMapping(value = "/UpdateCurriculum.action", method = RequestMethod.POST)
+	@ResponseBody
+	public Object UpdateCurriculum(@RequestBody Integer semester,@RequestBody Curriculum[] curriculums){
+		Subject subject = SecurityUtils.getSubject();
 		
-		return "forward:/CurriculumController/QueryCurriculum.action";
+		System.out.println(curriculums.length);
+		
+		/*List<TbUser> tbUsers = tbUserService.selectUserByLoginname((String)subject.getPrincipal());
+		if(tbUsers != null && tbUsers.size() > 0){		
+			Speciality speciality = specialityService.selectSpecialityByUserId(tbUsers.get(0).getId());
+			if(speciality != null){
+				int cnt = curriculumService.updateCurriculum(speciality.getId(), semester, course_ids);
+			}else{
+				return "failure";
+			}
+		}else{
+			return "failure";
+		}*/
+		
+		return "successful";
 	}
+	
 }
diff --git a/src/cn/edu/hrbcu/curriculum/dao/SpecialityMapper.java b/src/cn/edu/hrbcu/curriculum/dao/SpecialityMapper.java
new file mode 100644
index 0000000..fb756aa
--- /dev/null
+++ b/src/cn/edu/hrbcu/curriculum/dao/SpecialityMapper.java
@@ -0,0 +1,30 @@
+package cn.edu.hrbcu.curriculum.dao;
+
+import cn.edu.hrbcu.curriculum.pojo.Speciality;
+import cn.edu.hrbcu.curriculum.pojo.SpecialityExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface SpecialityMapper {
+    long countByExample(SpecialityExample example);
+
+    int deleteByExample(SpecialityExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(Speciality record);
+
+    int insertSelective(Speciality record);
+
+    List<Speciality> selectByExample(SpecialityExample example);
+
+    Speciality selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") Speciality record, @Param("example") SpecialityExample example);
+
+    int updateByExample(@Param("record") Speciality record, @Param("example") SpecialityExample example);
+
+    int updateByPrimaryKeySelective(Speciality record);
+
+    int updateByPrimaryKey(Speciality record);
+}
\ No newline at end of file
diff --git a/src/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml b/src/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml
index cebda36..72bbd56 100644
--- a/src/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml
+++ b/src/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml
@@ -9,6 +9,7 @@
     <result column="start" jdbcType="INTEGER" property="start" />
     <result column="end" jdbcType="INTEGER" property="end" />
     <result column="hpw" jdbcType="DOUBLE" property="hpw" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -69,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, specialityid, courseid, semester, start, end, hpw
+    id, specialityid, courseid, semester, start, end, hpw, sort
   </sql>
   <select id="selectByExample" parameterType="cn.edu.hrbcu.curriculum.pojo.CurriculumExample" resultMap="BaseResultMap">
     select
@@ -104,10 +105,10 @@
   <insert id="insert" parameterType="cn.edu.hrbcu.curriculum.pojo.Curriculum">
     insert into curriculum (id, specialityid, courseid, 
       semester, start, end, 
-      hpw)
+      hpw, sort)
     values (#{id,jdbcType=BIGINT}, #{specialityid,jdbcType=BIGINT}, #{courseid,jdbcType=BIGINT}, 
       #{semester,jdbcType=INTEGER}, #{start,jdbcType=INTEGER}, #{end,jdbcType=INTEGER}, 
-      #{hpw,jdbcType=DOUBLE})
+      #{hpw,jdbcType=DOUBLE}, #{sort,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="cn.edu.hrbcu.curriculum.pojo.Curriculum">
     insert into curriculum
@@ -133,6 +134,9 @@
       <if test="hpw != null">
         hpw,
       </if>
+      <if test="sort != null">
+        sort,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -156,6 +160,9 @@
       <if test="hpw != null">
         #{hpw,jdbcType=DOUBLE},
       </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="cn.edu.hrbcu.curriculum.pojo.CurriculumExample" resultType="java.lang.Long">
@@ -188,6 +195,9 @@
       <if test="record.hpw != null">
         hpw = #{record.hpw,jdbcType=DOUBLE},
       </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -201,7 +211,8 @@
       semester = #{record.semester,jdbcType=INTEGER},
       start = #{record.start,jdbcType=INTEGER},
       end = #{record.end,jdbcType=INTEGER},
-      hpw = #{record.hpw,jdbcType=DOUBLE}
+      hpw = #{record.hpw,jdbcType=DOUBLE},
+      sort = #{record.sort,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -227,6 +238,9 @@
       <if test="hpw != null">
         hpw = #{hpw,jdbcType=DOUBLE},
       </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -237,7 +251,8 @@
       semester = #{semester,jdbcType=INTEGER},
       start = #{start,jdbcType=INTEGER},
       end = #{end,jdbcType=INTEGER},
-      hpw = #{hpw,jdbcType=DOUBLE}
+      hpw = #{hpw,jdbcType=DOUBLE},
+      sort = #{sort,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/src/cn/edu/hrbcu/curriculum/mapper/SpecialityMapper.xml b/src/cn/edu/hrbcu/curriculum/mapper/SpecialityMapper.xml
new file mode 100644
index 0000000..3110934
--- /dev/null
+++ b/src/cn/edu/hrbcu/curriculum/mapper/SpecialityMapper.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.edu.hrbcu.curriculum.dao.SpecialityMapper">
+  <resultMap id="BaseResultMap" type="cn.edu.hrbcu.curriculum.pojo.Speciality">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="tbuserid" jdbcType="BIGINT" property="tbuserid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, name, tbuserid
+  </sql>
+  <select id="selectByExample" parameterType="cn.edu.hrbcu.curriculum.pojo.SpecialityExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from speciality
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from speciality
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from speciality
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="cn.edu.hrbcu.curriculum.pojo.SpecialityExample">
+    delete from speciality
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="cn.edu.hrbcu.curriculum.pojo.Speciality">
+    insert into speciality (id, name, tbuserid
+      )
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{tbuserid,jdbcType=BIGINT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="cn.edu.hrbcu.curriculum.pojo.Speciality">
+    insert into speciality
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="tbuserid != null">
+        tbuserid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="tbuserid != null">
+        #{tbuserid,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="cn.edu.hrbcu.curriculum.pojo.SpecialityExample" resultType="java.lang.Long">
+    select count(*) from speciality
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update speciality
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tbuserid != null">
+        tbuserid = #{record.tbuserid,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update speciality
+    set id = #{record.id,jdbcType=BIGINT},
+      name = #{record.name,jdbcType=VARCHAR},
+      tbuserid = #{record.tbuserid,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="cn.edu.hrbcu.curriculum.pojo.Speciality">
+    update speciality
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="tbuserid != null">
+        tbuserid = #{tbuserid,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="cn.edu.hrbcu.curriculum.pojo.Speciality">
+    update speciality
+    set name = #{name,jdbcType=VARCHAR},
+      tbuserid = #{tbuserid,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/src/cn/edu/hrbcu/curriculum/pojo/Curriculum.java b/src/cn/edu/hrbcu/curriculum/pojo/Curriculum.java
index ad50778..5549ee6 100644
--- a/src/cn/edu/hrbcu/curriculum/pojo/Curriculum.java
+++ b/src/cn/edu/hrbcu/curriculum/pojo/Curriculum.java
@@ -17,6 +17,8 @@ public class Curriculum implements Serializable {
 
     private Double hpw;
 
+    private Integer sort;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -74,4 +76,12 @@ public class Curriculum implements Serializable {
     public void setHpw(Double hpw) {
         this.hpw = hpw;
     }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 }
\ No newline at end of file
diff --git a/src/cn/edu/hrbcu/curriculum/pojo/CurriculumExample.java b/src/cn/edu/hrbcu/curriculum/pojo/CurriculumExample.java
index 323ad7b..5f43061 100644
--- a/src/cn/edu/hrbcu/curriculum/pojo/CurriculumExample.java
+++ b/src/cn/edu/hrbcu/curriculum/pojo/CurriculumExample.java
@@ -523,6 +523,66 @@ public class CurriculumExample {
             addCriterion("hpw not between", value1, value2, "hpw");
             return (Criteria) this;
         }
+
+        public Criteria andSortIsNull() {
+            addCriterion("sort is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIsNotNull() {
+            addCriterion("sort is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortEqualTo(Integer value) {
+            addCriterion("sort =", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotEqualTo(Integer value) {
+            addCriterion("sort <>", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortGreaterThan(Integer value) {
+            addCriterion("sort >", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortGreaterThanOrEqualTo(Integer value) {
+            addCriterion("sort >=", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortLessThan(Integer value) {
+            addCriterion("sort <", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortLessThanOrEqualTo(Integer value) {
+            addCriterion("sort <=", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIn(List<Integer> values) {
+            addCriterion("sort in", values, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotIn(List<Integer> values) {
+            addCriterion("sort not in", values, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortBetween(Integer value1, Integer value2) {
+            addCriterion("sort between", value1, value2, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotBetween(Integer value1, Integer value2) {
+            addCriterion("sort not between", value1, value2, "sort");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java b/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java
new file mode 100644
index 0000000..8849d54
--- /dev/null
+++ b/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java
@@ -0,0 +1,37 @@
+package cn.edu.hrbcu.curriculum.pojo;
+
+import java.io.Serializable;
+
+public class Speciality implements Serializable {
+    private Long id;
+
+    private String name;
+
+    private Long tbuserid;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public Long getTbuserid() {
+        return tbuserid;
+    }
+
+    public void setTbuserid(Long tbuserid) {
+        this.tbuserid = tbuserid;
+    }
+}
\ No newline at end of file
diff --git a/src/cn/edu/hrbcu/curriculum/pojo/SpecialityExample.java b/src/cn/edu/hrbcu/curriculum/pojo/SpecialityExample.java
new file mode 100644
index 0000000..fcf097c
--- /dev/null
+++ b/src/cn/edu/hrbcu/curriculum/pojo/SpecialityExample.java
@@ -0,0 +1,390 @@
+package cn.edu.hrbcu.curriculum.pojo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpecialityExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public SpecialityExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridIsNull() {
+            addCriterion("tbuserid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridIsNotNull() {
+            addCriterion("tbuserid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridEqualTo(Long value) {
+            addCriterion("tbuserid =", value, "tbuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridNotEqualTo(Long value) {
+            addCriterion("tbuserid <>", value, "tbuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridGreaterThan(Long value) {
+            addCriterion("tbuserid >", value, "tbuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridGreaterThanOrEqualTo(Long value) {
+            addCriterion("tbuserid >=", value, "tbuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridLessThan(Long value) {
+            addCriterion("tbuserid <", value, "tbuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridLessThanOrEqualTo(Long value) {
+            addCriterion("tbuserid <=", value, "tbuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridIn(List<Long> values) {
+            addCriterion("tbuserid in", values, "tbuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridNotIn(List<Long> values) {
+            addCriterion("tbuserid not in", values, "tbuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridBetween(Long value1, Long value2) {
+            addCriterion("tbuserid between", value1, value2, "tbuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTbuseridNotBetween(Long value1, Long value2) {
+            addCriterion("tbuserid not between", value1, value2, "tbuserid");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java b/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java
index b8b196e..1ca4540 100644
--- a/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java
+++ b/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java
@@ -12,8 +12,10 @@ public interface CurriculumService {
 
 	Curriculum selectCurriculumById(Curriculum curriculum);
 
-	int updateCurriculum(Curriculum curriculum);
-
 	List<Curriculum> selectCurriculums(int currentPage);
+	
+	int updateCurriculum(Long specialityid, int semester,String course_ids);
+	
+	List<Long> selectCurriculumIdsBy(Long specialityid,int semester, List<Long> ids);
 
 }
diff --git a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java
index 7ba4b7e..2f3ecff 100644
--- a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java
+++ b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java
@@ -1,6 +1,10 @@
 package cn.edu.hrbcu.curriculum.service;
 
+import java.util.ArrayList;
 import java.util.List;
+
+import org.apache.shiro.SecurityUtils;
+import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -9,14 +13,13 @@ import com.github.pagehelper.PageHelper;
 import cn.edu.hrbcu.curriculum.dao.CurriculumMapper;
 import cn.edu.hrbcu.curriculum.pojo.Curriculum;
 import cn.edu.hrbcu.curriculum.pojo.CurriculumExample;
-
+import cn.edu.hrbcu.curriculum.pojo.Speciality;
+import cn.edu.hrbcu.curriculum.pojo.TbUser;
 import cn.edu.hrbcu.utils.Common;
 
 
 @Service
 public class CurriculumServiceImpl implements CurriculumService{
-
-	
 	@Autowired
 	private CurriculumMapper curriculumMapper;
 	
@@ -45,9 +48,31 @@ public class CurriculumServiceImpl implements CurriculumService{
 	}
 
 	@Override
-	public int updateCurriculum(Curriculum curriculum) {
-		CurriculumExample example = new CurriculumExample();
-		return curriculumMapper.updateByExampleSelective(curriculum, example);
+	public int updateCurriculum(Long specialityid, int semester,String course_ids) {
+		String[] ids = null;
+		List<Long> new_ids = new ArrayList<Long>();
+		if(course_ids != null){
+			ids = course_ids.split(",");
+		}
+		
+		if(ids != null && ids.length > 0){
+			for (String id : ids) {
+				new_ids.add(Long.parseLong(id));
+			}
+		}
+		
+		List<Long> exist_ids = selectCurriculumIdsBy(specialityid,semester,new_ids);
+		
+		List<Long> remove_ids = new ArrayList<Long>();
+		remove_ids.addAll(exist_ids);
+		remove_ids.removeAll(new_ids);
+		
+		List<Long> add_ids = new ArrayList<Long>();
+		add_ids.addAll(new_ids);
+		add_ids.removeAll(exist_ids);
+		
+		
+		return 0;
 	}
 
 	@Override
@@ -63,4 +88,52 @@ public class CurriculumServiceImpl implements CurriculumService{
 		return list;
 	}
 
+	@Override
+	public List<Long> selectCurriculumIdsBy(Long specialityid, int semester, List<Long> ids) {
+		// TODO Auto-generated method stub
+		CurriculumExample example = new CurriculumExample();
+		CurriculumExample.Criteria criteria = example.createCriteria();
+		criteria.andSpecialityidEqualTo(specialityid);
+		criteria.andSemesterEqualTo(semester);
+		criteria.andCourseidIn(ids);
+		
+		List<Curriculum> curriculums = curriculumMapper.selectByExample(example);
+		
+		List<Long> exst_ids = new ArrayList<Long>();
+		if(curriculums != null && curriculums.size() > 0){
+			for (Curriculum curriculum : curriculums) {
+				exst_ids.add(curriculum.getCourseid());
+			}
+		}
+		return exst_ids;
+	}
+
+	@Test
+	public void TT(){
+		String[] ids = null;
+		List<Long> new_ids = new ArrayList<Long>();
+		new_ids.add(3L);
+		new_ids.add(2L);
+		
+		List<Long> exist_ids = new ArrayList<Long>();
+		exist_ids.add(1L);
+		exist_ids.add(2L);
+		
+		List<Long> remove_ids = new ArrayList<Long>();
+		remove_ids.addAll(exist_ids);
+		remove_ids.removeAll(new_ids);
+		
+		List<Long> update_ids = new ArrayList<Long>();
+		update_ids.addAll(exist_ids);
+		update_ids.retainAll(new_ids);
+		
+		List<Long> add_ids = new ArrayList<Long>();
+		add_ids.addAll(new_ids);
+		add_ids.removeAll(exist_ids);
+		
+		System.out.println(remove_ids.get(0) + ":" + remove_ids.size());
+		System.out.println(update_ids.get(0) + ":" + update_ids.size());
+		System.out.println(add_ids.get(0) + ":" + add_ids.size());
+
+	}
 }
diff --git a/src/cn/edu/hrbcu/curriculum/service/SpecialityService.java b/src/cn/edu/hrbcu/curriculum/service/SpecialityService.java
new file mode 100644
index 0000000..2702cfc
--- /dev/null
+++ b/src/cn/edu/hrbcu/curriculum/service/SpecialityService.java
@@ -0,0 +1,22 @@
+package cn.edu.hrbcu.curriculum.service;
+
+import java.util.List;
+import cn.edu.hrbcu.curriculum.pojo.Speciality;
+
+public interface SpecialityService {
+	
+	int insertUser(Speciality user);
+
+	int updateSpeciality(Speciality speciality);
+
+	Speciality selectSpecialityById(Speciality speciality);
+
+	void deletSpeciality(Speciality speciality);
+	
+	List<Speciality> selectSpecialitys(int currentPage);
+
+	List<Speciality> selectAllSpeciality();
+	
+	Speciality selectSpecialityByUserId(Long userid);
+
+}
diff --git a/src/cn/edu/hrbcu/curriculum/service/SpecialityServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/SpecialityServiceImpl.java
new file mode 100644
index 0000000..230cf80
--- /dev/null
+++ b/src/cn/edu/hrbcu/curriculum/service/SpecialityServiceImpl.java
@@ -0,0 +1,81 @@
+package cn.edu.hrbcu.curriculum.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.github.pagehelper.PageHelper;
+
+import cn.edu.hrbcu.curriculum.dao.SpecialityMapper;
+import cn.edu.hrbcu.curriculum.pojo.Speciality;
+import cn.edu.hrbcu.curriculum.pojo.SpecialityExample;
+import cn.edu.hrbcu.utils.Common;
+
+
+@Service
+public class SpecialityServiceImpl implements SpecialityService{
+	@Autowired
+	SpecialityMapper specialityMapper;
+	
+	@Override
+	public int insertUser(Speciality user) {
+		// TODO Auto-generated method stub
+		return specialityMapper.insert(user);
+	}
+
+	@Override
+	public List<Speciality> selectAllSpeciality() {
+		SpecialityExample example = new SpecialityExample();
+		SpecialityExample.Criteria criteria = example.createCriteria();
+		criteria.andIdGreaterThan(-1L);
+		
+		return specialityMapper.selectByExample(example);
+	}
+
+	public List<Speciality> selectSpecialitys(int currentPage) {
+		if(currentPage >= 0){
+			PageHelper.startPage(currentPage, Common.PAGE_SIZE);
+		}
+		// TODO Auto-generated method stub
+		SpecialityExample example = new SpecialityExample();
+		SpecialityExample.Criteria criteria = example.createCriteria();
+		criteria.andIdGreaterThan(0L);
+		List<Speciality> list = specialityMapper.selectByExample(example);
+		return list;
+	}
+
+	@Override
+	public int updateSpeciality(Speciality speciality) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public Speciality selectSpecialityById(Speciality speciality) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void deletSpeciality(Speciality speciality) {
+		specialityMapper.deleteByPrimaryKey(speciality.getId());
+		
+	}
+
+	@Override
+	public Speciality selectSpecialityByUserId(Long userid) {
+		// TODO Auto-generated method stub
+		SpecialityExample example = new SpecialityExample();
+		SpecialityExample.Criteria criteria = example.createCriteria();
+		criteria.andTbuseridEqualTo(userid);
+		List<Speciality> list = specialityMapper.selectByExample(example);
+		if(list != null && list.size() > 0)
+			return list.get(0);
+		
+		return null;
+	}
+
+
+
+}
diff --git a/src/cn/edu/hrbcu/curriculum/service/TbPermissionServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/TbPermissionServiceImpl.java
index 8cca906..33fbfd3 100644
--- a/src/cn/edu/hrbcu/curriculum/service/TbPermissionServiceImpl.java
+++ b/src/cn/edu/hrbcu/curriculum/service/TbPermissionServiceImpl.java
@@ -20,8 +20,6 @@ import cn.edu.hrbcu.utils.Common;
  */
 @Service
 public class TbPermissionServiceImpl implements TbPermissionService {
-
-
 	@Autowired
 	TbPermissionMapper tbPermissionMapper;
 	
-- 
Gitee