main
tamguo 7 years ago
parent 01462c5557
commit c33b55f107

@ -6,8 +6,10 @@ import java.util.Date;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.tamguo.modules.sys.model.enums.SysAreaStatusEnum; import com.tamguo.modules.sys.model.enums.SysAreaStatusEnum;
@ -27,7 +29,9 @@ public class SysAreaEntity implements Serializable {
private String areaCode; private String areaCode;
private String areaName; private String areaName;
private String areaType; private String areaType;
@TableField(fill = FieldFill.INSERT)
private String createBy; private String createBy;
@TableField(fill = FieldFill.INSERT)
private Date createDate; private Date createDate;
private String parentCode; private String parentCode;
private String parentCodes; private String parentCodes;
@ -41,7 +45,9 @@ public class SysAreaEntity implements Serializable {
private String treeNames; private String treeNames;
private BigDecimal treeSort; private BigDecimal treeSort;
private String treeSorts; private String treeSorts;
@TableField(fill = FieldFill.INSERT)
private String updateBy; private String updateBy;
@TableField(fill = FieldFill.INSERT)
private Date updateDate; private Date updateDate;
public SysAreaEntity() { public SysAreaEntity() {

@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotations.KeySequence;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
/** /**
* The persistent class for the sys_company database table. * The persistent class for the sys_company database table.
@ -28,7 +29,9 @@ public class SysCompanyEntity implements Serializable {
private String companyName; private String companyName;
private String corpCode; private String corpCode;
private String corpName; private String corpName;
@TableField(fill = FieldFill.INSERT)
private String createBy; private String createBy;
@TableField(fill = FieldFill.INSERT)
private Date createDate; private Date createDate;
private String fullName; private String fullName;
private String parentCode; private String parentCode;
@ -40,7 +43,9 @@ public class SysCompanyEntity implements Serializable {
private String treeNames; private String treeNames;
private String treeSort; private String treeSort;
private String treeSorts; private String treeSorts;
@TableField(fill = FieldFill.INSERT)
private String updateBy; private String updateBy;
@TableField(fill = FieldFill.INSERT)
private Date updateDate; private Date updateDate;
private String viewCode; private String viewCode;

@ -6,8 +6,10 @@ import java.util.Date;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.tamguo.modules.sys.model.enums.SysMenuStatusEnum; import com.tamguo.modules.sys.model.enums.SysMenuStatusEnum;
@ -25,7 +27,9 @@ public class SysMenuEntity implements Serializable {
@TableId @TableId
private String menuCode; private String menuCode;
@TableField(fill = FieldFill.INSERT)
private String createBy; private String createBy;
@TableField(fill = FieldFill.INSERT)
private Date createDate; private Date createDate;
private String isShow; private String isShow;
private String menuColor; private String menuColor;
@ -47,7 +51,9 @@ public class SysMenuEntity implements Serializable {
private String treeNames; private String treeNames;
private BigDecimal treeSort; private BigDecimal treeSort;
private String treeSorts; private String treeSorts;
@TableField(fill = FieldFill.INSERT)
private String updateBy; private String updateBy;
@TableField(fill = FieldFill.INSERT)
private Date updateDate; private Date updateDate;
private BigDecimal weight; private BigDecimal weight;

@ -4,8 +4,10 @@ import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
/** /**
@ -24,7 +26,9 @@ public class SysOfficeEntity implements Serializable {
private String address; private String address;
private String corpCode; private String corpCode;
private String corpName; private String corpName;
@TableField(fill = FieldFill.INSERT)
private String createBy; private String createBy;
@TableField(fill = FieldFill.INSERT)
private Date createDate; private Date createDate;
private String email; private String email;
private String fullName; private String fullName;
@ -41,7 +45,9 @@ public class SysOfficeEntity implements Serializable {
private String treeNames; private String treeNames;
private BigDecimal treeSort; private BigDecimal treeSort;
private String treeSorts; private String treeSorts;
@TableField(fill = FieldFill.INSERT)
private String updateBy; private String updateBy;
@TableField(fill = FieldFill.INSERT)
private Date updateDate; private Date updateDate;
private String viewCode; private String viewCode;
private String zipCode; private String zipCode;

@ -7,8 +7,10 @@ import java.util.Date;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.tamguo.modules.sys.model.enums.SysPostStatusEnum; import com.tamguo.modules.sys.model.enums.SysPostStatusEnum;
@ -24,7 +26,9 @@ public class SysPostEntity extends Model<SysPostEntity> implements Serializable
private String postCode; private String postCode;
private String corpCode; private String corpCode;
private String corpName; private String corpName;
@TableField(fill = FieldFill.INSERT)
private String createBy; private String createBy;
@TableField(fill = FieldFill.INSERT)
private Date createDate; private Date createDate;
private String postName; private String postName;
private BigDecimal postSort; private BigDecimal postSort;
@ -33,7 +37,9 @@ public class SysPostEntity extends Model<SysPostEntity> implements Serializable
@JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString)
private SysPostStatusEnum status; private SysPostStatusEnum status;
@TableField(fill = FieldFill.INSERT)
private String updateBy; private String updateBy;
@TableField(fill = FieldFill.INSERT)
private Date updateDate; private Date updateDate;
public SysPostEntity() { public SysPostEntity() {

@ -7,6 +7,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
/** /**
@ -21,7 +22,9 @@ public class SysRoleEntity implements Serializable {
private String roleCode; private String roleCode;
private String corpCode; private String corpCode;
private String corpName; private String corpName;
@TableField(fill = FieldFill.INSERT)
private String createBy; private String createBy;
@TableField(fill = FieldFill.INSERT)
private Date createDate; private Date createDate;
private String dataScope; private String dataScope;
private String isSys; private String isSys;
@ -30,7 +33,9 @@ public class SysRoleEntity implements Serializable {
private BigDecimal roleSort; private BigDecimal roleSort;
private String roleType; private String roleType;
private String status; private String status;
@TableField(fill = FieldFill.INSERT)
private String updateBy; private String updateBy;
@TableField(fill = FieldFill.INSERT)
private Date updateDate; private Date updateDate;
private String userType; private String userType;

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.tamguo.modules.sys.model.enums.SysUserMgrTypeEnum; import com.tamguo.modules.sys.model.enums.SysUserMgrTypeEnum;
import com.tamguo.modules.sys.model.enums.SysUserStatusEnum; import com.tamguo.modules.sys.model.enums.SysUserStatusEnum;
import com.tamguo.modules.sys.model.enums.SysUserTypeEnum; import com.tamguo.modules.sys.model.enums.SysUserTypeEnum;
@ -33,7 +34,9 @@ public class SysUserEntity extends Model<SysUserEntity> implements Serializable
private String avatar; private String avatar;
private String corpCode; private String corpCode;
private String corpName; private String corpName;
@TableField(fill = FieldFill.INSERT)
private String createBy; private String createBy;
@TableField(fill = FieldFill.INSERT)
private Date createDate; private Date createDate;
private String email; private String email;
private String freezeCause; private String freezeCause;
@ -72,7 +75,9 @@ public class SysUserEntity extends Model<SysUserEntity> implements Serializable
@JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString)
private SysUserStatusEnum status; private SysUserStatusEnum status;
@TableField(fill = FieldFill.INSERT)
private String updateBy; private String updateBy;
@TableField(fill = FieldFill.INSERT)
private Date updateDate; private Date updateDate;
private String userName; private String userName;
private String empName; private String empName;

@ -4,8 +4,10 @@ import java.util.Date;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.tamguo.modules.tiku.model.enums.SysSubjectStatusEnum; import com.tamguo.modules.tiku.model.enums.SysSubjectStatusEnum;
@TableName(value="tiku_subject") @TableName(value="tiku_subject")
@ -16,9 +18,13 @@ public class SubjectEntity {
private String name; private String name;
private String sort; private String sort;
@TableField(fill = FieldFill.INSERT)
private String createBy; private String createBy;
@TableField(fill = FieldFill.INSERT)
private String updateBy; private String updateBy;
@TableField(fill = FieldFill.INSERT)
private Date createDate; private Date createDate;
@TableField(fill = FieldFill.INSERT)
private Date updateDate; private Date updateDate;
private String remarks; private String remarks;

@ -9,4 +9,7 @@ public interface ISubjectService extends IService<SubjectEntity>{
Page<SubjectEntity> listData(SubjectCondition condition); Page<SubjectEntity> listData(SubjectCondition condition);
/** 保存分类*/
void save(SubjectEntity subject);
} }

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.tamguo.modules.tiku.dao.SubjectMapper; import com.tamguo.modules.tiku.dao.SubjectMapper;
import com.tamguo.modules.tiku.model.SubjectEntity; import com.tamguo.modules.tiku.model.SubjectEntity;
import com.tamguo.modules.tiku.model.condition.SubjectCondition; import com.tamguo.modules.tiku.model.condition.SubjectCondition;
import com.tamguo.modules.tiku.model.enums.SysSubjectStatusEnum;
import com.tamguo.modules.tiku.service.ISubjectService; import com.tamguo.modules.tiku.service.ISubjectService;
@Service @Service
@ -34,4 +35,11 @@ public class SubjectService extends ServiceImpl<SubjectMapper, SubjectEntity> im
return page.setRecords(subjectMapper.selectPage(page, query)); return page.setRecords(subjectMapper.selectPage(page, query));
} }
@Transactional(readOnly=false)
@Override
public void save(SubjectEntity subject) {
subject.setStatus(SysSubjectStatusEnum.NORMAL);
subjectMapper.insert(subject);
}
} }

@ -11,8 +11,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
public class SysPageController { public class SysPageController {
@RequestMapping("sys/{fn}/{page}") @RequestMapping("sys/{fn}/{page}")
public String page(@PathVariable("fn") String fn , @PathVariable("page") String page){ public String sys(@PathVariable("fn") String fn , @PathVariable("page") String page){
return "modules/sys/" + fn + "/" + page; return "modules/sys/" + fn + "/" + page;
} }
@RequestMapping("tiku/{fn}/{page}")
public String ti(@PathVariable("fn") String fn , @PathVariable("page") String page){
return "modules/tiku/" + fn + "/" + page;
}
} }

@ -8,14 +8,16 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.tamguo.common.utils.ExceptionSupport;
import com.tamguo.common.utils.Result; import com.tamguo.common.utils.Result;
import com.tamguo.modules.tiku.model.SubjectEntity; import com.tamguo.modules.tiku.model.SubjectEntity;
import com.tamguo.modules.tiku.model.condition.SubjectCondition; import com.tamguo.modules.tiku.model.condition.SubjectCondition;
import com.tamguo.modules.tiku.service.ISubjectService; import com.tamguo.modules.tiku.service.ISubjectService;
@Controller @Controller
@RequestMapping(path="tk/subject") @RequestMapping(path="tiku/subject")
public class SubjectController { public class SubjectController {
/** 题库分类*/ /** 题库分类*/
@ -36,4 +38,27 @@ public class SubjectController {
Page<SubjectEntity> page = iSubjectService.listData(condition); Page<SubjectEntity> page = iSubjectService.listData(condition);
return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages()); return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages());
} }
@SuppressWarnings("unchecked")
@RequestMapping(path="checkSubjectCode",method=RequestMethod.GET)
@ResponseBody
public Boolean checkSubjectCode(String uid) {
Integer count = iSubjectService.selectCount(Condition.create().eq("uid", uid));
if(count > 0) {
return false;
}else {
return true;
}
}
@RequestMapping(path="save",method=RequestMethod.POST)
@ResponseBody
public Result save(SubjectEntity subject) {
try {
iSubjectService.save(subject);
return Result.result(0, null, "保存分类【"+subject.getName()+"】成功");
} catch (Exception e) {
return ExceptionSupport.resolverResult("保存分类", this.getClass(), e);
}
}
} }

@ -391,7 +391,7 @@ var roleGrid = $("#roleGrid").dataGrid({
{name:'ctrlPermi',value:'2'} {name:'ctrlPermi',value:'2'}
], ],
columnModel: [ columnModel: [
{header:'角色名称', name:'roleName', sortable:false, width:100, align:"center"}, {header:'角色名称', name:'name', sortable:false, width:100, align:"center"},
{header:'角色编码', name:'id', sortable:false, width:100, align:"center"} {header:'角色编码', name:'id', sortable:false, width:100, align:"center"}
], ],
showCheckbox: true, showCheckbox: true,

@ -0,0 +1,113 @@
<!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/subject/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 hide">*</span> 排序号:<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<input type="text" id="postSort" name="postSort" value="40" 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.result == Global.TRUE){
js.closeCurrentTabPage(function(contentWindow){
contentWindow.page();
});
}
}, "json");
}
});
</script>

@ -29,7 +29,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
</div> </div>
</div> </div>
<div class="box-body"> <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=""> <form id="searchForm" th:action="${setting.domain + 'tiku/subject/listData'}" method="post" class="form-inline hide" data-page-no="1" data-page-size="20" data-order-by="">
<div class="form-group"> <div class="form-group">
<label class="control-label">类型编码:</label> <label class="control-label">类型编码:</label>
<div class="control-inline"> <div class="control-inline">

Loading…
Cancel
Save