章节

tamguo-mobile/src/main/java/com/tamguo/model/ChapterEntity.java

@@ -16,6 +16,8 @@ import java.util.List;
 public class ChapterEntity extends SuperEntity<ChapterEntity> implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	private String subjectId;
+	
 	private String courseId;
 
 	private String name;
@@ -90,4 +92,12 @@ public class ChapterEntity extends SuperEntity<ChapterEntity> implements Seriali
 		this.orders = orders;
 	}
 
+	public String getSubjectId() {
+		return subjectId;
+	}
+
+	public void setSubjectId(String subjectId) {
+		this.subjectId = subjectId;
+	}
+
 }

tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/ChapterCondition.java

@@ -5,6 +5,8 @@ public class ChapterCondition {
 	private String parentCode;
 	private String id;
 	private String name;
+	private String bookId;
+	private String bookName;
 	
 	public String getParentCode() {
 		return parentCode;
@@ -24,5 +26,17 @@ public class ChapterCondition {
 	public void setName(String name) {
 		this.name = name;
 	}
+	public String getBookId() {
+		return bookId;
+	}
+	public void setBookId(String bookId) {
+		this.bookId = bookId;
+	}
+	public String getBookName() {
+		return bookName;
+	}
+	public void setBookName(String bookName) {
+		this.bookName = bookName;
+	}
 
 }

tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/ChapterServiceImpl.java

@@ -84,6 +84,15 @@ public class ChapterServiceImpl extends ServiceImpl<ChapterMapper, ChapterEntity
 		}else {
 			query.eq("tree_level", "0");
 		}
+		if(!StringUtils.isEmpty(condition.getId())) {
+			query.eq("id", condition.getId());
+		}
+		if(!StringUtils.isEmpty(condition.getName())) {
+			query.like("name", condition.getName());
+		}
+		if(!StringUtils.isEmpty(condition.getBookId())) {
+			query.andNew().eq("course_id", condition.getBookId()).or().eq("book_id", condition.getBookId()).or().eq("subject_id", condition.getBookId());;
+		}
 		return chapterMapper.selectList(query);
 	}
 

tamguo-oms/src/main/resources/templates/modules/tiku/chapter/add.html

@@ -166,17 +166,6 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 						</div>
 					</div>
 				</div>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
-								<span class="required hide">*</span> 备注信息：<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10">
-								<textarea id="remarks" name="remarks" rows="4" maxlength="500" class="form-control "></textarea>
-							</div>
-						</div>
-					</div>
-				</div>
 			</div>
 			<div class="box-footer">
 				<div class="row">

tamguo-oms/src/main/resources/templates/modules/tiku/chapter/index.html

@@ -68,8 +68,8 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:
 	callback:{onClick:function(event, treeId, treeNode){
 		tree.expandNode(treeNode);
 		win.$('input[type=reset]').click();
-		win.$('#companyCode').val(treeNode.id);
+		win.$('#bookId').val(treeNode.id);
-		win.$('#companyName').val(treeNode.name);
+		win.$('#bookName').val(treeNode.name);
 		win.page();
 	}}
 }, tree, loadTree = function(){

tamguo-oms/src/main/resources/templates/modules/tiku/chapter/list.html

@@ -36,6 +36,8 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 		</div>
 		<div class="box-body">
 			<form id="searchForm" th:action="${setting.domain + 'tiku/chapter/listData'}" method="post" class="form-inline hide" data-page-no="" data-page-size="" data-order-by="">
+				<input type="hidden" id="bookId" name="bookId" value=""></input>
+				<input type="hidden" id="bookName" name="bookName" value=""></input>
 				<div class="form-group">
 					<label class="control-label">章节代码：</label>
 					<div class="control-inline">