From 47ae24262d09b06bfa9933b81274e48cb6ec5528 Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Mon, 23 Jul 2018 18:12:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/service/IPostService.java     |   3 +-
 .../sys/service/impl/PostServiceImpl.java     |   3 +-
 .../modules/sys/web/PostController.java       |  15 ++
 .../templates/modules/sys/post/detail.html    | 129 ++++++++++++++++++
 .../templates/modules/sys/post/index.html     |  14 +-
 5 files changed, 155 insertions(+), 9 deletions(-)
 create mode 100644 tamguo-oms/src/main/resources/templates/modules/sys/post/detail.html

diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/IPostService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/IPostService.java
index c23881a..479fe6a 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/IPostService.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/IPostService.java
@@ -1,10 +1,11 @@
 package com.tamguo.modules.sys.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.IService;
 import com.tamguo.modules.sys.model.SysPostEntity;
 import com.tamguo.modules.sys.model.condition.SysPostCondition;
 
-public interface IPostService {
+public interface IPostService extends IService<SysPostEntity>{
 
 	Page<SysPostEntity> listData(SysPostCondition condition);
 
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/PostServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/PostServiceImpl.java
index 54925c1..76cbc93 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/PostServiceImpl.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/PostServiceImpl.java
@@ -4,13 +4,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.tamguo.modules.sys.dao.SysPostMapper;
 import com.tamguo.modules.sys.model.SysPostEntity;
 import com.tamguo.modules.sys.model.condition.SysPostCondition;
 import com.tamguo.modules.sys.service.IPostService;
 
 @Service
-public class PostServiceImpl implements IPostService{
+public class PostServiceImpl extends ServiceImpl<SysPostMapper, SysPostEntity> implements IPostService{
 	
 	@Autowired
 	private SysPostMapper sysPostMapper;
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/PostController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/PostController.java
index 6452ddf..2ba33aa 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/PostController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/PostController.java
@@ -4,9 +4,11 @@ import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
 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.modules.sys.model.SysPostEntity;
@@ -19,6 +21,7 @@ import com.tamguo.modules.sys.utils.Result;
 public class PostController {
 
 	private final String POST_INDEX_PAGE = "modules/sys/post/index";
+	private final String POST_DETAIL_PAGE = "modules/sys/post/detail";
 	
 	@Autowired
 	private IPostService iPostService;
@@ -28,6 +31,18 @@ public class PostController {
 		return POST_INDEX_PAGE;
 	}
 	
+	@RequestMapping(path="detail")
+	public ModelAndView detail(ModelAndView model , String id) {
+		if(StringUtils.isEmpty(id)) {
+			model.addObject("title", "新增岗位");
+		}else {
+			model.addObject("title", "修改岗位");
+			model.addObject("post", iPostService.selectById(id));
+		}
+		model.setViewName(POST_DETAIL_PAGE);
+		return model;
+	}
+	
 	@RequestMapping(path="listData",method=RequestMethod.POST)
 	@ResponseBody
 	public Map<String, Object> listData(SysPostCondition condition) {
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/post/detail.html b/tamguo-oms/src/main/resources/templates/modules/sys/post/detail.html
new file mode 100644
index 0000000..3ed42f8
--- /dev/null
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/post/detail.html
@@ -0,0 +1,129 @@
+<!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" th:utext="${'<i class=fa icon-trophy></i>' + title}">
+			</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" action="/js/a/sys/post/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="hidden" id="oldRoleName" name="oldRoleName" value=""/>
+<input type="text" id="name" name="name" th:value="${post.name}" maxlength="100" class="form-control required " remote="/js/a/sys/post/checkPostName?oldPostName=" data-msg-remote="岗位名称已存在"/>
+							</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="hidden" id="isNewRecord" name="isNewRecord" value="true"/>
+<input type="text" id="code" name="code" th:value="${post.code}" maxlength="64" 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 hide">*</span> 岗位分类：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<select id="postType" name="postType" class="form-control ">
+									<option value="">&nbsp;</option>
+									<option value="gaoguan" th:selected="${post.postType.value=='gaoguan'}? true : false">高管</option>
+									<option value="zhongceng" th:selected="${post.postType.value=='zhongceng'}? true : false">中层</option>
+									<option value="jiceng" th:select="${post.postType.value=='jiceng'}? true : false">基层</option>
+									<option value="qita" th:select="${post.postType.value=='qita'}? true : false">其它</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="sorts" name="sorts" th:value="${post.sorts}" 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="${post.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.result == Global.TRUE){
+				js.closeCurrentTabPage(function(contentWindow){
+					contentWindow.page();
+				});
+			}
+		}, "json");
+    }
+});
+</script>
\ No newline at end of file
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/post/index.html b/tamguo-oms/src/main/resources/templates/modules/sys/post/index.html
index e160fc0..3cde61c 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/post/index.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/post/index.html
@@ -25,7 +25,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
-					<a href="/js/a/sys/post/form" class="btn btn-default btnTool" title="新增岗位"><i class="fa fa-plus"></i> 新增</a>
+					<a th:href="${setting.domain + 'sys/post/detail'}" class="btn btn-default btnTool" title="新增岗位"><i class="fa fa-plus"></i> 新增</a>
 			</div>
 		</div>
 		<div class="box-body">
@@ -88,13 +88,13 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 <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>
+<script type="text/javascript" th:inline="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="/js/a/sys/post/form?postCode='+row.postCode+'" class="btnList" data-title="编辑岗位">'+(val||row.id)+'</a>';
+			return '<a href="'+ctx+'sys/post/detail?id='+row.id+'" class="btnList" data-title="编辑岗位">'+(val||row.id)+'</a>';
 		}},
 		{header:'岗位编码', name:'code', index:'a.post_code', width:200, align:"center"},
 		{header:'排序号', name:'sorts', index:'a.post_sort', width:80, align:"center"},
@@ -124,14 +124,14 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'操作', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){
 			var actions = [];
-				actions.push('<a href="/js/a/sys/post/form?postCode='+row.postCode+'" class="btnList" title="编辑岗位"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="'+ctx+'sys/post/detail?id='+row.id+'" class="btnList" title="编辑岗位"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == "normal"){
-					actions.push('<a href="/js/a/sys/post/disable?postCode='+row.postCode+'" class="btnList" title="停用岗位" data-confirm="确认要停用该岗位吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
+					actions.push('<a href="'+ctx+'sys/post/detail?id='+row.id+'" class="btnList" title="停用岗位" data-confirm="确认要停用该岗位吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
 				}
 				if (row.status == "disabled"){
-					actions.push('<a href="/js/a/sys/post/enable?postCode='+row.postCode+'" class="btnList" title="启用岗位" data-confirm="确认要启用该岗位吗？"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
+					actions.push('<a href="/js/a/sys/post/enable?postCode='+row.id+'" class="btnList" title="启用岗位" data-confirm="确认要启用该岗位吗？"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
-				actions.push('<a href="/js/a/sys/post/delete?postCode='+row.postCode+'" class="btnList" title="删除岗位" data-confirm="确认要删除该岗位吗？"><i class="fa fa-trash-o"></i></a>&nbsp;');
+				actions.push('<a href="/js/a/sys/post/delete?postCode='+row.id+'" class="btnList" title="删除岗位" data-confirm="确认要删除该岗位吗？"><i class="fa fa-trash-o"></i></a>&nbsp;');
 			return actions.join('');
 		}}
 	],