题库类型

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

@@ -2,8 +2,11 @@ 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.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.tamguo.modules.tiku.model.enums.SysSubjectStatusEnum;
 
 @TableName(value="tiku_subject")
 public class SubjectEntity {
@@ -17,6 +20,12 @@ public class SubjectEntity {
 	private String updateBy;
 	private Date createDate;
 	private Date updateDate;
+	
+	private String remarks;
+	
+	@JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString)
+	private SysSubjectStatusEnum status;
+	
 	public String getUid() {
 		return uid;
 	}
@@ -59,5 +68,17 @@ public class SubjectEntity {
 	public void setUpdateDate(Date updateDate) {
 		this.updateDate = updateDate;
 	}
+	public SysSubjectStatusEnum getStatus() {
+		return status;
+	}
+	public void setStatus(SysSubjectStatusEnum 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/SubjectCondition.java

@@ -5,6 +5,10 @@ public class SubjectCondition {
 	private Integer pageNo;
 	private Integer pageSize;
 	
+	private String uid;
+	private String name;
+	private String status;
+	
 	public Integer getPageSize() {
 		return pageSize;
 	}
@@ -17,5 +21,23 @@ public class SubjectCondition {
 	public void setPageNo(Integer pageNo) {
 		this.pageNo = pageNo;
 	}
+	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;
+	}
 	
 }

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

@@ -0,0 +1,34 @@
+package com.tamguo.modules.tiku.model.enums;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.enums.IEnum;
+
+/**
+ * 类型状态
+ */
+public enum SysSubjectStatusEnum implements IEnum {
+	NORMAL("normal", "正常"),
+	DELETE("delete", "删除"),
+	DISABLED("disabled" , "停用");
+
+    private String value;
+    private String desc;
+
+    SysSubjectStatusEnum(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/impl/SubjectService.java

@@ -2,6 +2,8 @@ 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 org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.plugins.Page;
@@ -16,11 +18,20 @@ public class SubjectService extends ServiceImpl<SubjectMapper, SubjectEntity> im
 	@Autowired
 	private SubjectMapper subjectMapper;
 
+	@Transactional(readOnly=false)
 	@SuppressWarnings("unchecked")
 	@Override
 	public Page<SubjectEntity> listData(SubjectCondition condition) {
 		Page<SubjectEntity> page = new Page<>(condition.getPageNo(), condition.getPageSize());
-		return page.setRecords(subjectMapper.selectPage(page, Condition.EMPTY));
+		Condition query = Condition.create();
+		if(!StringUtils.isEmpty(condition.getUid())) {
+			query.eq("uid", condition.getUid());
+		}else if(!StringUtils.isEmpty(condition.getName())) {
+			query.eq("name", condition.getName());
+		}else if(!StringUtils.isEmpty(condition.getStatus())) {
+			query.eq("status", condition.getStatus());
+		}
+		return page.setRecords(subjectMapper.selectPage(page, query));
 	}
 
 }

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

@@ -1,9 +1,7 @@
 package com.tamguo.modules.tiku.web;
 
 import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -31,29 +31,17 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 		<div class="box-body">
 <form id="searchForm" th:action="${setting.domain + 'tk/subject/listData'}" method="post" class="form-inline hide" data-page-no="1" data-page-size="20" data-order-by="">
 				<div class="form-group">
-					<label class="control-label">岗位编码：</label>
+					<label class="control-label">类型编码：</label>
 					<div class="control-inline">
-<input type="text" id="code" name="code" value="" maxlength="64" class="form-control width-120"/>
+<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>
+					<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-90">
-						<select id="postType" name="postType" class="form-control">
-							<option value="">&nbsp;</option>
-							<option value="gaoguan">高管</option>
-							<option value="zhongceng">中层</option>
-							<option value="jiceng">基层</option>
-							<option value="qita">其它</option>
-						</select>					
-					</div>
-				</div>
 				<div class="form-group">
 					<label class="control-label">状态：</label>
 					<div class="control-inline width-60">
@@ -93,10 +81,10 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
-		{header:'岗位名称', name:'name', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){
+		{header:'类型名称', name:'name', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){
 			return '<a href="'+ctx+'tk/post/detail?id='+row.id+'" class="btnList" data-title="编辑岗位">'+(val||row.id)+'</a>';
 		}},
-		{header:'岗位编码', name:'id', index:'a.post_code', width:200, align:"center"},
+		{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"},