科目管理

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

@@ -2,10 +2,13 @@ package com.tamguo.modules.tiku.model;
 
 import java.util.Date;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.FieldFill;
+import com.tamguo.modules.tiku.model.enums.CourseStatusEnum;
 
 @TableName(value="tiku_course")
 public class CourseEntity {
@@ -17,6 +20,7 @@ public class CourseEntity {
 	private Integer sort;
 	private Integer questionNum;
 	private Integer pointNum;
+	private String remarks;
 	
 	@TableField(fill = FieldFill.INSERT)
 	private String createBy;
@@ -27,6 +31,9 @@ public class CourseEntity {
 	@TableField(fill = FieldFill.INSERT)
 	private Date updateDate;
 	
+	@JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString)
+	private CourseStatusEnum status;
+	
 	public String getUid() {
 		return uid;
 	}
@@ -87,5 +94,17 @@ public class CourseEntity {
 	public void setUpdateDate(Date updateDate) {
 		this.updateDate = updateDate;
 	}
+	public CourseStatusEnum getStatus() {
+		return status;
+	}
+	public void setStatus(CourseStatusEnum status) {
+		this.status = status;
+	}
+	public String getRemarks() {
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
 
 }

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

@@ -5,6 +5,11 @@ public class CourseCondition {
 	private Integer pageNo;
 	private Integer pageSize;
 	
+	private String uid;
+	private String name;
+	private String status;
+	private String subjectId;
+	
 	public Integer getPageNo() {
 		return pageNo;
 	}
@@ -17,5 +22,29 @@ public class CourseCondition {
 	public void setPageSize(Integer pageSize) {
 		this.pageSize = pageSize;
 	}
+	public String getUid() {
+		return uid;
+	}
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public String getSubjectId() {
+		return subjectId;
+	}
+	public void setSubjectId(String subjectId) {
+		this.subjectId = subjectId;
+	}
 	
 }

tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/enums/CourseStatusEnum.java

@@ -0,0 +1,34 @@
+package com.tamguo.modules.tiku.model.enums;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.enums.IEnum;
+
+/**
+ * 类型状态
+ */
+public enum CourseStatusEnum implements IEnum {
+	NORMAL("normal", "正常"),
+	DELETE("delete", "删除"),
+	DISABLED("disabled" , "停用");
+
+    private String value;
+    private String desc;
+
+    CourseStatusEnum(final String value, final String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Serializable getValue() {
+        return this.value;
+    }
+
+    public String getDesc(){
+        return this.desc;
+    }
+    
+    @Override
+    public String toString() {
+    	return this.value;
+    }
+}

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

@@ -1,11 +1,18 @@
 package com.tamguo.modules.tiku.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.IService;
 import com.tamguo.modules.tiku.model.CourseEntity;
-import com.tamguo.modules.tiku.model.condition.SubjectCondition;
+import com.tamguo.modules.tiku.model.condition.CourseCondition;
 
-public interface ICourseService {
+public interface ICourseService extends IService<CourseEntity>{
 
-	Page<CourseEntity> listData(SubjectCondition condition);
+	Page<CourseEntity> listData(CourseCondition condition);
+
+	/** 保存科目*/
+	void save(CourseEntity course);
+
+	/** 修改科目*/
+	void update(CourseEntity course);
 
 }

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

@@ -1,15 +1,19 @@
 package com.tamguo.modules.tiku.service.impl;
 
+import java.util.Arrays;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 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.model.condition.CourseCondition;
+import com.tamguo.modules.tiku.model.enums.CourseStatusEnum;
 import com.tamguo.modules.tiku.service.ICourseService;
 
 @Service
@@ -21,10 +25,36 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, CourseEntity> i
 	@SuppressWarnings("unchecked")
 	@Transactional(readOnly=true)
 	@Override
-	public Page<CourseEntity> listData(SubjectCondition condition) {
-		Page<CourseEntity> page = new Page<>();
+	public Page<CourseEntity> listData(CourseCondition condition) {
+		Page<CourseEntity> page = new Page<>(condition.getPageNo() , condition.getPageSize());
 		Condition query = Condition.create();
+		if(!StringUtils.isEmpty(condition.getUid())) {
+			query.eq("uid", condition.getUid());
+		}
+		if(!StringUtils.isEmpty(condition.getName())) {
+			query.like("name", condition.getName());
+		}
+		if(!StringUtils.isEmpty(condition.getSubjectId())) {
+			query.eq("subject_id", condition.getSubjectId());
+		}
+		if(!StringUtils.isEmpty(condition.getStatus())) {
+			query.eq("status", condition.getStatus());
+		}
+		query.orderAsc(Arrays.asList("sort"));
 		return page.setRecords(courseMapper.selectPage(page , query));
 	}
 
+	@Transactional(readOnly=false)
+	@Override
+	public void save(CourseEntity course) {
+		course.setStatus(CourseStatusEnum.NORMAL);
+		courseMapper.insert(course);
+	}
+
+	@Transactional(readOnly=false)
+	@Override
+	public void update(CourseEntity course) {
+		courseMapper.updateById(course);
+	}
+
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java

@@ -41,7 +41,7 @@ public class SysUserController {
 	@RequestMapping(path="list")
 	public ModelAndView list(ModelAndView model) {
 		model.setViewName(USER_LIST_PAGE);
-		model.addObject("postList", iSysPostService.selectList(Condition.create().eq("status", "0")));
+		model.addObject("postList", iSysPostService.selectList(Condition.create().eq("status", "normal")));
 		return model;
 	}
 	
@@ -49,7 +49,7 @@ public class SysUserController {
 	@RequestMapping(path="add")
 	public ModelAndView add(String userCode , ModelAndView model) {
 		model.setViewName(USER_ADD_PAGE);
-		model.addObject("postList", iSysPostService.selectList(Condition.create().eq("status", "0")));
+		model.addObject("postList", iSysPostService.selectList(Condition.create().eq("status", "normal")));
 		return model;
 	}
 	

tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java

@@ -1,7 +1,6 @@
 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;
@@ -9,31 +8,81 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.tamguo.common.utils.ExceptionSupport;
 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.model.condition.CourseCondition;
+import com.tamguo.modules.tiku.model.enums.SubjectStatusEnum;
 import com.tamguo.modules.tiku.service.ICourseService;
+import com.tamguo.modules.tiku.service.ISubjectService;
 
 @Controller
 @RequestMapping(path="tiku/course")
 public class CourseController {
 
-	/** 题库科目*/
+	/** 科目*/
 	private final String COURSE_INDEX_PAGE = "modules/tiku/course/list";
+	private final String COURSE_ADD_PAGE = "modules/tiku/course/add";
+	private final String COURSE_UPDATE_PAGE = "modules/tiku/course/update";
+	
 	@Autowired
 	private ICourseService iCourseService;
+	@Autowired
+	private ISubjectService iSubjectService;
 	
+	@SuppressWarnings("unchecked")
 	@RequestMapping(path="list")
 	public ModelAndView index(ModelAndView model) {
 		model.setViewName(COURSE_INDEX_PAGE);
+		model.addObject("subjectList", iSubjectService.selectList(Condition.create().eq("status", SubjectStatusEnum.NORMAL.getValue())));
+		return model;
+	}
+	
+	@SuppressWarnings("unchecked")
+	@RequestMapping(path="add")
+	public ModelAndView add(ModelAndView model) {
+		model.setViewName(COURSE_ADD_PAGE);
+		model.addObject("subjectList", iSubjectService.selectList(Condition.create().eq("status", SubjectStatusEnum.NORMAL.getValue())));
+		return model;
+	}
+	
+	@SuppressWarnings("unchecked")
+	@RequestMapping(path="update")
+	public ModelAndView update(String uid, ModelAndView model) {
+		model.setViewName(COURSE_UPDATE_PAGE);
+		model.addObject("subjectList", iSubjectService.selectList(Condition.create().eq("status", SubjectStatusEnum.NORMAL.getValue())));
+		model.addObject("course", iCourseService.selectById(uid));
 		return model;
 	}
 
 	@RequestMapping(path="listData",method=RequestMethod.POST)
 	@ResponseBody
-	public Map<String, Object> listData(SubjectCondition condition) {
+	public Map<String, Object> listData(CourseCondition condition) {
 		Page<CourseEntity> page = iCourseService.listData(condition);
 		return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages());
 	}
+	
+	@RequestMapping(path="save",method=RequestMethod.POST)
+	@ResponseBody
+	public Result save(CourseEntity course) {
+		try {
+			iCourseService.save(course);
+			return Result.result(0, null, "保存科目【"+course.getName()+"】成功");
+		} catch (Exception e) {
+			return ExceptionSupport.resolverResult("保存科目", this.getClass(), e);
+		}
+	}
+	
+	@RequestMapping(path="update",method=RequestMethod.POST)
+	@ResponseBody
+	public Result update(CourseEntity course) {
+		try {
+			iCourseService.update(course);
+			return Result.result(0, null, "修改科目【"+course.getName()+"】成功");
+		} catch (Exception e) {
+			return ExceptionSupport.resolverResult("修改科目", this.getClass(), e);
+		}
+	}
 }

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

@@ -0,0 +1,125 @@
+<!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 + 'adminlte/css/AdminLTE.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'common/jeesite.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'static/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">
+				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+			</div>
+		</div>
+<form id="inputForm" th:action="${setting.domain + 'tiku/course/save'}" method="post" class="form-horizontal">
+			<div class="box-body">
+				<div class="form-unit">基本信息</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 科目名称：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="name" name="name" value="" maxlength="100" class="form-control required "/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 科目编码：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="uid" name="uid" value="" maxlength="64" class="form-control required abc" th:remote="${setting.domain + 'tiku/subject/checkSubjectCode'}" data-msg-remote="岗位名称已存在"/>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 题库类型：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<select id="subjectId" name="subjectId" class="form-control">
+									<option value="">&nbsp;</option>
+									<option th:value="${subject.uid}" th:each="subject,subjectStat:${subjectList}" th:text="${subject.name}">财务经理</option>
+								</select>	
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> 排序号：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="sort" name="sort" value="" maxlength="10" class="form-control digits"/>
+							</div>
+						</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">
+					<div class="col-sm-offset-2 col-sm-10">
+							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> 保 存</button>&nbsp;
+						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> 关 闭</button>
+					</div>
+				</div>
+			</div>
+</form>
+	</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 + 'jquery-validation/1.16/jquery.validate.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/localization/messages_zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/jquery.validate.extend.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>
+$("#inputForm").validate({
+	submitHandler: function(form){
+		js.ajaxSubmitForm($(form), function(data){
+			js.showMessage(data.message);
+			if(data.code == 0){
+				js.closeCurrentTabPage(function(contentWindow){
+					contentWindow.page();
+				});
+			}
+		}, "json");
+    }
+});
+</script>

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

@@ -42,6 +42,16 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 <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-120">
+						<select id="subjectId" name="subjectId" class="form-control">
+							<option value="">&nbsp;</option>
+							<option th:value="${subject.uid}" th:each="subject,subjectStat:${subjectList}" th:text="${subject.name}">财务经理</option>
+						</select>					
+					</div>
+				</div>
+
 				<div class="form-group">
 					<label class="control-label">状态：</label>
 					<div class="control-inline width-60">
@@ -82,7 +92,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/course/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"},
@@ -99,14 +109,14 @@ $('#dataGrid').dataGrid({
 		}},
 		{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;');
+				actions.push('<a href="'+ctx+'tiku/course/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;');
+					actions.push('<a href="'+ctx+'tiku/course/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/course/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;');
+				actions.push('<a href="'+ctx+'tiku/course/delete?uid='+row.uid+'" class="btnList" title="删除分类" data-confirm="确认要删除该分类吗？"><i class="fa fa-trash-o"></i></a>&nbsp;');
 			return actions.join('');
 		}}
 	],

tamguo-oms/src/main/resources/templates/modules/tiku/course/update.html

@@ -0,0 +1,125 @@
+<!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 + '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">
+				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+			</div>
+		</div>
+		<form id="inputForm" th:action="${setting.domain + 'tiku/course/update'}" method="post" class="form-horizontal">
+			<div class="box-body">
+				<div class="form-unit">基本信息</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 科目名称：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="name" name="name" th:value="${course.name}" maxlength="100" class="form-control required "/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 科目编码：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="uid" name="uid" th:value="${course.uid}" maxlength="64" readonly="true" class="form-control required abc"/>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 题库类型：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<select id="subjectId" name="subjectId" class="form-control">
+									<option value="">&nbsp;</option>
+									<option th:selected="${subject.uid eq course.subjectId} ? true : false" th:value="${subject.uid}" th:each="subject,subjectStat:${subjectList}" th:text="${subject.name}">财务经理</option>
+								</select>	
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> 排序号：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="sort" name="sort" th:value="${course.sort}" maxlength="10" class="form-control digits"/>
+							</div>
+						</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 " th:utext="${course.remarks}"></textarea>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="box-footer">
+				<div class="row">
+					<div class="col-sm-offset-2 col-sm-10">
+							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> 保 存</button>&nbsp;
+						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> 关 闭</button>
+					</div>
+				</div>
+			</div>
+</form>
+	</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 + 'jquery-validation/1.16/jquery.validate.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/localization/messages_zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/jquery.validate.extend.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>
+$("#inputForm").validate({
+	submitHandler: function(form){
+		js.ajaxSubmitForm($(form), function(data){
+			js.showMessage(data.message);
+			if(data.code == 0){
+				js.closeCurrentTabPage(function(contentWindow){
+					contentWindow.page();
+				});
+			}
+		}, "json");
+    }
+});
+</script>

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

@@ -102,7 +102,7 @@ $("#inputForm").validate({
 	submitHandler: function(form){
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);
-			if(data.result == Global.TRUE){
+			if(data.code == 0){
 				js.closeCurrentTabPage(function(contentWindow){
 					contentWindow.page();
 				});