luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:人员上岗

Browse Source
ln_ry20250512
wangxy 4 months ago
parent 3f735ccf28
commit dc08d49484
5 changed files with 497 additions and 2 deletions
Show Stats Download Patch File Download Diff File

181
ruoyi-admin/src/main/resources/templates/system/newdev/apply/add.html
Unescape View File

@ -0,0 +1,181 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增人员')" />
<th:block th:include="include :: select2-css" />
</head>
<body>
<div class="main-content">
<form id="form-apply-add" class="form-horizontal">
<h4 class="form-header h4">基本信息</h4>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">姓名：</label>
<div class="col-sm-8">
<input name="name" id="name" placeholder="请输入姓名" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">性别：</label>
<div class="col-sm-8">
<input name="sex" id="sex" placeholder="请输入性别" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">国籍：</label>
<div class="col-sm-8">
<input id="nationa" name="nationa" placeholder="请输入国籍" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">曾用名：</label>
<div class="col-sm-8">
<input id="formerName" name="formerName" placeholder="请输入曾用名" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">民族：</label>
<div class="col-sm-8">
<input name="nationality" placeholder="请输入民族" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">婚姻状况：</label>
<div class="col-sm-8">
<input name="maritalStatus" placeholder="请输入婚姻状况" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">政治面貌：</label>
<div class="col-sm-8">
<input name="political" required class="form-control" placeholder="请输入政治面貌" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">联系方式：</label>
<div class="col-sm-8">
<input name="phone" required class="form-control" placeholder="请输入联系方式" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">身份证号：</label>
<div class="col-sm-8">
<input name="cerno" required class="form-control" placeholder="请输入身份证号" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">户籍地址：</label>
<div class="col-sm-8">
<input name="address" required class="form-control" placeholder="请输入户籍地址" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">户籍地公安机关：</label>
<div class="col-sm-8">
<input name="registeredAuthority" required class="form-control" placeholder="请输入户籍地公安机关" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">常住地址：</label>
<div class="col-sm-8">
<input name="permanentAddress" required class="form-control" placeholder="请输入常住地址" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">常住地公安机关：</label>
<div class="col-sm-8">
<input name="residentBureau" required class="form-control" placeholder="请输入常住地公安机关" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">单位及职务职称：</label>
<div class="col-sm-8">
<input name="positionCapacity" required class="form-control" placeholder="请输入单位及职务职称" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">已（拟）任涉密岗位：</label>
<div class="col-sm-8">
<input name="smPost" required class="form-control" placeholder="请输入已（拟）任涉密岗位" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">涉密等级：</label>
<div class="col-sm-8">
<input name="smGrade" required class="form-control" placeholder="请输入涉密等级" type="text">
</div>
</div>
</div>
</div>
</form>
</div>
<div class="row">
<div class="col-sm-offset-5 col-sm-10">
<button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
<button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: select2-js" />
<script>
var prefix = ctx + "system/applyList";
function submitHandler() {
if ($.validate.form() ) {
var data = $("#form-apply-add").serializeArray();
$.operate.saveTab(prefix + "/add", data);
}
}
</script>
</body>
</html>

132
ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html
Unescape View File

@ -0,0 +1,132 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('涉密人员列表')" />
</head>
<body class="gray-bg">
<div class="container-div" id="app">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label style="width: 80px">姓名：</label>
<input type="text" name="name"/>
</li>
<li>
<label>性别：</label>
<input type="text" name="sex"/>
</li>
<li>
<label>身份证号：</label>
<input type="text" name="cerno"/>
</li>
<li>
<label>联系方式：</label>
<input type="text" name="phone"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick=$.operate.addTab() shiro:hasPermission="system:apply:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.editTab()" shiro:hasPermission="system:apply:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:apply:remove">
<i class="fa fa-remove"></i> 删除
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:apply:edit')}]];
var detailFlag = [[${@permission.hasPermi('system:apply:editFile')}]]
var removeFlag = [[${@permission.hasPermi('system:apply:remove')}]];
var prefix = ctx + "system/applyList";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
detailUrl:prefix + "/detail/{id}",
removeUrl: prefix + "/remove",
modalName: "涉密人员上岗",
type: 0,
columns: [{
checkbox: true
},
{
field: 'applyId',
title: 'id',
visible: false
},
{
field: 'name',
title: '姓名'
},
{
field: 'sex',
title: '性别'
},
{
field: 'nationality',
title: '民族',
},
{
field: 'maritalStatus',
title: '婚姻状况',
},
{
field: 'cerno',
title: '身份证号',
},
{
field: 'phone',
title: '联系方式',
},
{
field: 'smPost',
title: '已（拟）任涉密岗位',
},
{
field: 'smGrade',
title: '涉密等级',
},
{
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.applyId + '\')"><i class="fa fa-edit"></i>材料提交</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.applyId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.applyId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>

178
ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html
Unescape View File

@ -0,0 +1,178 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改人员')" />
<th:block th:include="include :: select2-css" />
</head>
<body>
<div class="main-content">
<form class="form-horizontal" id="form-apply-edit" th:object="${applyInfoList}">
<input name="applyId" type="hidden" th:field="*{applyId}" />
<h4 class="form-header h4">基本信息</h4>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">姓名：</label>
<div class="col-sm-8">
<input name="name" id="name" placeholder="请输入姓名" th:field="*{name}" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">性别：</label>
<div class="col-sm-8">
<input name="sex" id="sex" placeholder="请输入性别" th:field="*{sex}" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">国籍：</label>
<div class="col-sm-8">
<input id="nationa" name="nationa" placeholder="请输入国籍" th:field="*{nationa}" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">曾用名：</label>
<div class="col-sm-8">
<input id="formerName" name="formerName" placeholder="请输入曾用名" th:field="*{formerName}" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">民族：</label>
<div class="col-sm-8">
<input name="nationality" placeholder="请输入民族" class="form-control" th:field="*{nationality}" type="text" maxlength="30" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">婚姻状况：</label>
<div class="col-sm-8">
<input name="maritalStatus" placeholder="请输入婚姻状况" th:field="*{maritalStatus}" class="form-control" type="text" maxlength="30" required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">政治面貌：</label>
<div class="col-sm-8">
<input name="political" required class="form-control" th:field="*{political}" placeholder="请输入政治面貌" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">联系方式：</label>
<div class="col-sm-8">
<input name="phone" required class="form-control" th:field="*{phone}" placeholder="请输入联系方式" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">身份证号：</label>
<div class="col-sm-8">
<input name="cerno" required class="form-control" th:field="*{cerno}" placeholder="请输入身份证号" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">户籍地址：</label>
<div class="col-sm-8">
<input name="address" required class="form-control" th:field="*{address}" placeholder="请输入户籍地址" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">户籍地公安机关：</label>
<div class="col-sm-8">
<input name="registeredAuthority" required class="form-control" th:field="*{registeredAuthority}" placeholder="请输入户籍地公安机关" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">常住地址：</label>
<div class="col-sm-8">
<input name="permanentAddress" required class="form-control" th:field="*{permanentAddress}" placeholder="请输入常住地址" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">常住地公安机关：</label>
<div class="col-sm-8">
<input name="residentBureau" required class="form-control" th:field="*{residentBureau}" placeholder="请输入常住地公安机关" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">单位及职务职称：</label>
<div class="col-sm-8">
<input name="positionCapacity" required class="form-control" th:field="*{positionCapacity}" placeholder="请输入单位及职务职称" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">已（拟）任涉密岗位：</label>
<div class="col-sm-8">
<input name="smPost" required class="form-control" th:field="*{smPost}" placeholder="请输入已（拟）任涉密岗位" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">涉密等级：</label>
<div class="col-sm-8">
<input name="smGrade" required class="form-control" th:field="*{smGrade}" placeholder="请输入涉密等级" type="text">
</div>
</div>
</div>
</div>
</form>
</div>
<div class="row">
<div class="col-sm-offset-5 col-sm-10">
<button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
<button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: select2-js" />
<script type="text/javascript">
var prefix = ctx + "system/applyList";
function submitHandler() {
if ($.validate.form()) {
var data = $("#form-apply-edit").serializeArray();
$.operate.saveTab(prefix + "/edit", data);
}
}
</script>
</body>
</html>

2
ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.system.service.apply.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.system.domain.apply.TdApplyInfoList;
import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO;
import com.ruoyi.system.mapper.apply.TdApplyInfoListMapper;
@ -22,6 +23,7 @@ public class TdApplyInfoListServiceImpl extends ServiceImpl<TdApplyInfoListMappe
@Resource
private TdApplyInfoListMapper applyInfoListMapper;
@DataScope(deptAlias = "d")
@Override
public List<TdApplyInfoList> selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO) {
return applyInfoListMapper.selectTdApplyInfoListList(applyInfoListDTO);

6
ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml
Unescape View File

@ -49,7 +49,7 @@
sm_grade,photo_url
</sql>
<select id="selectTdApplyInfoListList" resultType="com.ruoyi.system.domain.apply.TdApplyInfoList">
select <include refid="Base_Column_List"/> from td_apply_info_list
select <include refid="Base_Column_List"/> from td_apply_info_list d
<trim prefix="where" prefixOverrides="and|or">
<if test="name!=null and name!=''">
AND name = #{name}
@ -69,7 +69,9 @@
<if test="smPost!=null and smPost!=''">
AND sm_post = #{smPost}
</if>
AND status = '0'
AND apply_status = '0'
<!-- 数据范围过滤 -->
${params.dataScope}
</trim>
ORDER BY create_time DESC
</select>

Write Preview
Loading…
Cancel
Save