From 2098a71ac804df552dcb2ea1f22c86e4f5fde66f Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Fri, 3 Aug 2018 16:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tamguo/modules/tiku/dao/CourseMapper.java |   8 ++
 .../modules/tiku/model/CourseEntity.java      |  91 ++++++++++++++
 .../tiku/model/condition/CourseCondition.java |  21 ++++
 .../modules/tiku/service/ICourseService.java  |  11 ++
 .../tiku/service/impl/CourseServiceImpl.java  |  30 +++++
 .../modules/tiku/web/CourseController.java    |  39 ++++++
 .../modules/tiku/web/SubjectController.java   |   2 +-
 .../templates/modules/tiku/course/list.html   | 118 ++++++++++++++++++
 .../tiku/subject/{index.html => list.html}    |   2 +-
 9 files changed, 320 insertions(+), 2 deletions(-)
 create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/CourseMapper.java
 create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java
 create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/CourseCondition.java
 create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java
 create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java
 create mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java
 create mode 100644 tamguo-oms/src/main/resources/templates/modules/tiku/course/list.html
 rename tamguo-oms/src/main/resources/templates/modules/tiku/subject/{index.html => list.html} (97%)

diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/CourseMapper.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/CourseMapper.java
new file mode 100644
index 0000000..1b0270b
--- /dev/null
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/CourseMapper.java
@@ -0,0 +1,8 @@
+package com.tamguo.modules.tiku.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.tamguo.modules.tiku.model.CourseEntity;
+
+public interface CourseMapper extends BaseMapper<CourseEntity>{
+
+}
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java
new file mode 100644
index 0000000..eeb4649
--- /dev/null
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java
@@ -0,0 +1,91 @@
+package com.tamguo.modules.tiku.model;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldFill;
+
+@TableName(value="tiku_course")
+public class CourseEntity {
+	
+	@TableId
+	private String uid;
+	private String subjectId;
+	private String name;
+	private Integer sort;
+	private Integer questionNum;
+	private Integer pointNum;
+	
+	@TableField(fill = FieldFill.INSERT)
+	private String createBy;
+	@TableField(fill = FieldFill.INSERT)
+	private String updateBy;
+	@TableField(fill = FieldFill.INSERT)
+	private Date createDate;
+	@TableField(fill = FieldFill.INSERT)
+	private Date updateDate;
+	
+	public String getUid() {
+		return uid;
+	}
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+	public String getSubjectId() {
+		return subjectId;
+	}
+	public void setSubjectId(String subjectId) {
+		this.subjectId = subjectId;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public Integer getSort() {
+		return sort;
+	}
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+	public Integer getQuestionNum() {
+		return questionNum;
+	}
+	public void setQuestionNum(Integer questionNum) {
+		this.questionNum = questionNum;
+	}
+	public Integer getPointNum() {
+		return pointNum;
+	}
+	public void setPointNum(Integer pointNum) {
+		this.pointNum = pointNum;
+	}
+	public String getCreateBy() {
+		return createBy;
+	}
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+	public String getUpdateBy() {
+		return updateBy;
+	}
+	public void setUpdateBy(String updateBy) {
+		this.updateBy = updateBy;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
+}
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/CourseCondition.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/CourseCondition.java
new file mode 100644
index 0000000..c83c5bc
--- /dev/null
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/condition/CourseCondition.java
@@ -0,0 +1,21 @@
+package com.tamguo.modules.tiku.model.condition;
+
+public class CourseCondition {
+
+	private Integer pageNo;
+	private Integer pageSize;
+	
+	public Integer getPageNo() {
+		return pageNo;
+	}
+	public void setPageNo(Integer pageNo) {
+		this.pageNo = pageNo;
+	}
+	public Integer getPageSize() {
+		return pageSize;
+	}
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+	
+}
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java
new file mode 100644
index 0000000..2404f73
--- /dev/null
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java
@@ -0,0 +1,11 @@
+package com.tamguo.modules.tiku.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.tamguo.modules.tiku.model.CourseEntity;
+import com.tamguo.modules.tiku.model.condition.SubjectCondition;
+
+public interface ICourseService {
+
+	Page<CourseEntity> listData(SubjectCondition condition);
+
+}
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java
new file mode 100644
index 0000000..48ab838
--- /dev/null
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java
@@ -0,0 +1,30 @@
+package com.tamguo.modules.tiku.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.mapper.Condition;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.tamguo.modules.tiku.dao.CourseMapper;
+import com.tamguo.modules.tiku.model.CourseEntity;
+import com.tamguo.modules.tiku.model.condition.SubjectCondition;
+import com.tamguo.modules.tiku.service.ICourseService;
+
+@Service
+public class CourseServiceImpl extends ServiceImpl<CourseMapper, CourseEntity> implements ICourseService{
+	
+	@Autowired
+	public CourseMapper courseMapper;
+
+	@SuppressWarnings("unchecked")
+	@Transactional(readOnly=true)
+	@Override
+	public Page<CourseEntity> listData(SubjectCondition condition) {
+		Page<CourseEntity> page = new Page<>();
+		Condition query = Condition.create();
+		return page.setRecords(courseMapper.selectPage(page , query));
+	}
+
+}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java
new file mode 100644
index 0000000..5c1ba58
--- /dev/null
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java
@@ -0,0 +1,39 @@
+package com.tamguo.modules.tiku.web;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.tamguo.common.utils.Result;
+import com.tamguo.modules.tiku.model.CourseEntity;
+import com.tamguo.modules.tiku.model.condition.SubjectCondition;
+import com.tamguo.modules.tiku.service.ICourseService;
+
+@Controller
+@RequestMapping(path="tiku/course")
+public class CourseController {
+
+	/** 题库科目*/
+	private final String COURSE_INDEX_PAGE = "modules/tiku/course/list";
+	@Autowired
+	private ICourseService iCourseService;
+	
+	@RequestMapping(path="list")
+	public ModelAndView index(ModelAndView model) {
+		model.setViewName(COURSE_INDEX_PAGE);
+		return model;
+	}
+
+	@RequestMapping(path="listData",method=RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> listData(SubjectCondition condition) {
+		Page<CourseEntity> page = iCourseService.listData(condition);
+		return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages());
+	}
+}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/SubjectController.java b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/SubjectController.java
index 35e3bac..8406795 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/SubjectController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/SubjectController.java
@@ -21,7 +21,7 @@ import com.tamguo.modules.tiku.service.ISubjectService;
 public class SubjectController {
 
 	/** 题库分类*/
-	private final String SUBJECT_INDEX_PAGE = "modules/tiku/subject/index";
+	private final String SUBJECT_INDEX_PAGE = "modules/tiku/subject/list";
 	private final String SUBJECT_UPDATE_PAGE = "modules/tiku/subject/update";
 	
 	@Autowired
diff --git a/tamguo-oms/src/main/resources/templates/modules/tiku/course/list.html b/tamguo-oms/src/main/resources/templates/modules/tiku/course/list.html
new file mode 100644
index 0000000..7669dc8
--- /dev/null
+++ b/tamguo-oms/src/main/resources/templates/modules/tiku/course/list.html
@@ -0,0 +1,118 @@
+<!DOCTYPE html><html><head><meta charset="utf-8"><meta content="webkit" name="renderer"/><meta http-equiv="X-UA-Compatible"
+content="IE=edge"><meta name="keywords" content="PoweredByJeeSiteV4.0"/><meta http-equiv="Cache-Control"
+content="no-cache, no-store, must-revalidate"/><meta name="description" content="PoweredByJeeSiteV4.0"/><meta
+content="no-cache" http-equiv="Pragma"/><meta http-equiv="Expires" content="0"/><meta
+content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
+<title>科目管理 - JeeSite Demo</title>
+<script th:src="${setting.domain + 'global.min.js'}"></script>
+<script th:src="${setting.domain + 'jquery/jquery-1.12.4.min.js'}"></script>
+<script th:src="${setting.domain + 'jquery/jquery-migrate-1.4.1.min.js'}"></script>
+<!--[if lt IE 9]><script src="/js/static/common/h5fix.min.js"></script><![endif]-->
+<link rel="stylesheet" th:href="${setting.domain + 'fonts/font-icons.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'bootstrap/css/bootstrap.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'select2/4.0/select2.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'icheck/1.0/minimal/grey.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'jqGrid/4.7/css/ui.jqgrid.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'adminlte/css/AdminLTE.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'common/jeesite.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'common/common.css'}">
+</head><body class="hold-transition ">
+<div class="wrapper"><div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa icon-trophy"></i> 科目管理
+			</div>
+			<div class="box-tools pull-right">
+				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
+					<a th:href="${setting.domain + 'tiku/course/add'}" class="btn btn-default btnTool" title="新增科目"><i class="fa fa-plus"></i> 新增</a>
+			</div>
+		</div>
+		<div class="box-body">
+<form id="searchForm" th:action="${setting.domain + 'tiku/course/listData'}" method="post" class="form-inline hide" data-page-no="1" data-page-size="10" data-order-by="">
+				<div class="form-group">
+					<label class="control-label">科目编码：</label>
+					<div class="control-inline">
+<input type="text" id="uid" name="uid" value="" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">科目名称：</label>
+					<div class="control-inline">
+<input type="text" id="name" name="name" value="" maxlength="100" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">状态：</label>
+					<div class="control-inline width-60">
+						<select id="status" name="status" class="form-control">
+							<option value="">&nbsp;</option>
+							<option value="normal">正常</option>
+							<option value="disabled">停用</option>
+						</select>					
+					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">查询</button>
+					<button type="reset" class="btn btn-default btn-sm">重置</button>
+				</div>
+</form>
+			<table id="dataGrid"></table>
+			<div id="dataGridPage"></div>
+		</div>
+	</div>
+</div>
+</div>
+
+<a id="scroll-up" href="#" class="btn btn-sm"><i class="fa fa-angle-double-up"></i></a>
+<script th:src="${setting.domain + 'bootstrap/js/bootstrap.min.js'}"></script>
+<script th:src="${setting.domain + 'select2/4.0/select2.js'}"></script>
+<script th:src="${setting.domain + 'select2/4.0/i18n/zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'layer/3.1/layer.js'}"></script>
+<script th:src="${setting.domain + 'my97/WdatePicker.js'}"></script>
+<script th:src="${setting.domain + 'jqGrid/4.7/js/jquery.jqGrid.js'}"></script>
+<script th:src="${setting.domain + 'jqGrid/4.7/js/jquery.jqGrid.extend.js'}"></script>
+<script th:src="${setting.domain + 'jqGrid/4.7/js/i18n/zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'common/jeesite.js'}"></script>
+<script th:src="${setting.domain + 'common/i18n/jeesite_zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'common/common.js'}"></script>
+<script type="text/javascript">
+// 初始化DataGrid对象
+$('#dataGrid').dataGrid({
+	searchForm: $("#searchForm"),
+	columnModel: [
+		{header:'类型名称', name:'name', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){
+			return '<a href="'+ctx+'tiku/subject/update?uid='+row.uid+'" class="btnList" data-title="编辑岗位">'+(val||row.uid)+'</a>';
+		}},
+		{header:'类型编码', name:'uid', index:'a.post_code', width:200, align:"center"},
+		{header:'排序号', name:'sort', index:'a.post_sort', width:80, align:"center"},
+		{header:'更新时间', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'备注信息', name:'remarks', index:'a.remarks', width:200, align:"left"},
+		{header:'状态', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
+			if(val == "normal"){
+				return '正常';
+			}else if(val == "disabled"){
+				return '<span style="color:red;">停用</span>';
+			}else{
+				return '<span style="color:red;">未知</span>';
+			}
+		}},
+		{header:'操作', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){
+			var actions = [];
+				actions.push('<a href="'+ctx+'tiku/subject/update?uid='+row.uid+'" class="btnList" title="编辑分类"><i class="fa fa-pencil"></i></a>&nbsp;');
+				if (row.status == "normal"){
+					actions.push('<a href="'+ctx+'tiku/subject/disabled?uid='+row.uid+'" class="btnList" title="停用分类" data-confirm="确认要停用该分类吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
+				}
+				if (row.status == "disabled"){
+					actions.push('<a href="'+ctx+'tiku/subject/enable?uid='+row.uid+'" class="btnList" title="启用分类" data-confirm="确认要启用该分类吗？"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
+				}
+				actions.push('<a href="'+ctx+'tiku/subject/delete?uid='+row.uid+'" class="btnList" title="删除分类" data-confirm="确认要删除该分类吗？"><i class="fa fa-trash-o"></i></a>&nbsp;');
+			return actions.join('');
+		}}
+	],
+	// 加载成功后执行事件
+	ajaxSuccess: function(data){
+		
+	}
+});
+</script>
\ No newline at end of file
diff --git a/tamguo-oms/src/main/resources/templates/modules/tiku/subject/index.html b/tamguo-oms/src/main/resources/templates/modules/tiku/subject/list.html
similarity index 97%
rename from tamguo-oms/src/main/resources/templates/modules/tiku/subject/index.html
rename to tamguo-oms/src/main/resources/templates/modules/tiku/subject/list.html
index e7b45f6..1da1071 100644
--- a/tamguo-oms/src/main/resources/templates/modules/tiku/subject/index.html
+++ b/tamguo-oms/src/main/resources/templates/modules/tiku/subject/list.html
@@ -82,7 +82,7 @@ $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'类型名称', name:'name', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){
-			return '<a href="'+ctx+'tiku/subject/update?uid='+row.uid+'" class="btnList" data-title="编辑岗位">'+(val||row.uid)+'</a>';
+			return '<a href="'+ctx+'tiku/subject/update?uid='+row.uid+'" class="btnList" data-title="编辑类型">'+(val||row.uid)+'</a>';
 		}},
 		{header:'类型编码', name:'uid', index:'a.post_code', width:200, align:"center"},
 		{header:'排序号', name:'sort', index:'a.post_sort', width:80, align:"center"},