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

Merge remote-tracking branch 'origin/master'

Browse Source
master
dshclm 11 months ago
parent cc38b73c57 c1219232f7
commit ebf7aa5e5a
6 changed files with 362 additions and 303 deletions
Show Stats Download Patch File Download Diff File

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java
Unescape View File

@ -8,6 +8,7 @@ import com.ruoyi.common.utils.sql.SqlUtil;
import com.ruoyi.common.utils.uuid.Seq;
import com.ruoyi.framework.web.domain.server.Sys;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.TdFileReceive;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ITdFileReceiveService;
@ -103,8 +104,17 @@ public class TdFileProvideController extends BaseController
public AjaxResult addSave(TdFileProvide tdFileProvide)
{
tdFileProvide.setFileId("File_"+Seq.getId(Seq.commSeqType));
String[] tar = tdFileProvide.getTargetDepart().split(",");
for (String depart : tar) {
TdFileReceive tdFileReceive = new TdFileReceive();
tdFileReceive.setFileId(tdFileProvide.getFileId());
tdFileReceive.setFileName(tdFileProvide.getFileName());
tdFileReceive.setProvideDepart(tdFileProvide.getProvideDepart());
tdFileReceive.setProvideDate(tdFileProvide.getProvideDate());
tdFileReceive.setReceiveDepartid(depart);
tdFileReceiveService.insertTdFileReceive(tdFileReceive);
}
System.out.println(tdFileProvide.getTargetDepart());
return toAjax(tdFileProvideService.insertTdFileProvide(tdFileProvide));
}

191
ruoyi-admin/src/main/resources/templates/system/filereceive/add.html
Unescape View File

@ -5,107 +5,128 @@
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-filereceive-add">
<div class="form-group">
<label class="col-sm-3 control-label">文件编号：</label>
<div class="col-sm-8">
<input name="fileId" class="form-control" type="text">
</div>
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-filereceive-add">
<div class="form-group">
<label class="col-sm-3 control-label">文件编号：</label>
<div class="col-sm-8">
<input name="fileId" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收单位：</label>
<div class="col-sm-8">
<input name="receiveDepartid" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">文件名称：</label>
<div class="col-sm-8">
<input name="fileName" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收状态：</label>
<div class="col-sm-8">
<select name="receiveState" class="form-control m-b" th:with="type=${@dict.getType('sys_file_receive')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">发文单位：</label>
<div class="col-sm-8">
<input name="provideDepart" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收人员：</label>
<div class="col-sm-8">
<input name="receiveUserid" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">发文日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="provideDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="receiveDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收单位：</label>
<div class="col-sm-8">
<input name="receiveDepartid" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取状态：</label>
<div class="col-sm-8">
<select name="extractState" class="form-control m-b" th:with="type=${@dict.getType('sys_file_extract')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收状态：</label>
<div class="col-sm-8">
<input name="receiveState" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取单位：</label>
<div class="col-sm-8">
<input name="extractDepartid" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收人员：</label>
<div class="col-sm-8">
<input name="receiveUserid" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取人员：</label>
<div class="col-sm-8">
<input name="extractUserid" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="receiveDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="extractDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取状态：</label>
<div class="col-sm-8">
<input name="extractState" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取单位：</label>
<div class="col-sm-8">
<input name="extractDepartid" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取人员：</label>
<div class="col-sm-8">
<input name="extractUserid" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">销毁状态：</label>
<div class="col-sm-8">
<select name="destoryState" class="form-control m-b" th:with="type=${@dict.getType('sys_destory_state')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="extractDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "system/filereceive"
$("#form-filereceive-add").validate({
focusCleanup: true
});
</div>
<div class="form-group">
<label class="col-sm-3 control-label">销毁状态：</label>
<div class="col-sm-8">
<input name="destoryState" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "system/filereceive"
$("#form-filereceive-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-filereceive-add').serialize());
}
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-filereceive-add').serialize());
}
}
$("input[name='provideDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='receiveDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='receiveDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='extractDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
$("input[name='extractDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

193
ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html
Unescape View File

@ -5,108 +5,129 @@
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-filereceive-edit" th:object="${tdFileReceive}">
<input name="receiveId" th:field="*{receiveId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">文件编号：</label>
<div class="col-sm-8">
<input name="fileId" th:field="*{fileId}" class="form-control" type="text">
</div>
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-filereceive-edit" th:object="${tdFileReceive}">
<input name="receiveId" th:field="*{receiveId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">文件编号：</label>
<div class="col-sm-8">
<input name="fileId" th:field="*{fileId}" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收单位：</label>
<div class="col-sm-8">
<input name="receiveDepartid" th:field="*{receiveDepartid}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">文件名称：</label>
<div class="col-sm-8">
<input name="fileName" th:field="*{fileName}" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收状态：</label>
<div class="col-sm-8">
<select name="receiveState" class="form-control m-b" th:with="type=${@dict.getType('sys_file_receive')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{receiveState}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">发文单位：</label>
<div class="col-sm-8">
<input name="provideDepart" th:field="*{provideDepart}" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收人员：</label>
<div class="col-sm-8">
<input name="receiveUserid" th:field="*{receiveUserid}" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">发文日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="provideDate" th:value="${#dates.format(tdFileReceive.provideDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="receiveDate" th:value="${#dates.format(tdFileReceive.receiveDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收单位：</label>
<div class="col-sm-8">
<input name="receiveDepartid" th:field="*{receiveDepartid}" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取状态：</label>
<div class="col-sm-8">
<select name="extractState" class="form-control m-b" th:with="type=${@dict.getType('sys_file_extract')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{extractState}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收状态：</label>
<div class="col-sm-8">
<input name="receiveState" th:field="*{receiveState}" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取单位：</label>
<div class="col-sm-8">
<input name="extractDepartid" th:field="*{extractDepartid}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收人员：</label>
<div class="col-sm-8">
<input name="receiveUserid" th:field="*{receiveUserid}" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取人员：</label>
<div class="col-sm-8">
<input name="extractUserid" th:field="*{extractUserid}" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">接收日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="receiveDate" th:value="${#dates.format(tdFileReceive.receiveDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="extractDate" th:value="${#dates.format(tdFileReceive.extractDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取状态：</label>
<div class="col-sm-8">
<input name="extractState" th:field="*{extractState}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取单位：</label>
<div class="col-sm-8">
<input name="extractDepartid" th:field="*{extractDepartid}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取人员：</label>
<div class="col-sm-8">
<input name="extractUserid" th:field="*{extractUserid}" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">销毁状态：</label>
<div class="col-sm-8">
<select name="destoryState" class="form-control m-b" th:with="type=${@dict.getType('sys_destory_state')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{destoryState}"></option>
</select>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">提取日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="extractDate" th:value="${#dates.format(tdFileReceive.extractDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "system/filereceive";
$("#form-filereceive-edit").validate({
focusCleanup: true
});
</div>
<div class="form-group">
<label class="col-sm-3 control-label">销毁状态：</label>
<div class="col-sm-8">
<input name="destoryState" th:field="*{destoryState}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "system/filereceive";
$("#form-filereceive-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-filereceive-edit').serialize());
}
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-filereceive-edit').serialize());
}
}
$("input[name='provideDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='receiveDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='receiveDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='extractDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
$("input[name='extractDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

208
ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html
Unescape View File

@ -4,109 +4,71 @@
<th:block th:include="include :: header('涉密文件接收列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>文件编号：</label>
<input type="text" name="fileId"/>
</li>
<li>
<label>接收单位：</label>
<input type="text" name="receiveDepartid"/>
</li>
<li>
<label>接收状态：</label>
<select name="receiveState" th:with="type=${@dict.getType('sys_file_receive')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>接收人员：</label>
<input type="text" name="receiveUserid"/>
</li>
<li>
<label>接收日期：</label>
<input type="text" class="time-input" placeholder="请选择接收日期" name="receiveDate"/>
</li>
<li>
<label>提取状态：</label>
<select name="extractState" th:with="type=${@dict.getType('sys_file_extract')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>提取单位：</label>
<input type="text" name="extractDepartid"/>
</li>
<li>
<label>提取人员：</label>
<input type="text" name="extractUserid"/>
</li>
<li>
<label>提取日期：</label>
<input type="text" class="time-input" placeholder="请选择提取日期" name="extractDate"/>
</li>
<li>
<label>销毁状态：</label>
<select name="destoryState" th:with="type=${@dict.getType('sys_destory_state')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</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="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>文件编号：</label>
<input type="text" name="fileId"/>
</li>
<li>
<label>文件名称：</label>
<input type="text" name="fileName"/>
</li>
<li>
<label>发文单位：</label>
<input type="text" name="provideDepart"/>
</li>
<li>
<label>接收状态：</label>
<input type="text" name="receiveState"/>
</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.add()" shiro:hasPermission="system:filereceive:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:filereceive:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:filereceive:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:filereceive:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:filereceive:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:filereceive:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:filereceive:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:filereceive:remove')}]];
var receiveStateDatas = [[${@dict.getType('sys_file_receive')}]];
var extractStateDatas = [[${@dict.getType('sys_file_extract')}]];
var destoryStateDatas = [[${@dict.getType('sys_destory_state')}]];
var prefix = ctx + "system/filereceive";
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:filereceive:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:filereceive:remove')}]];
var receiveStateDatas = [[${@dict.getType('sys_file_receive')}]];
var extractStateDatas = [[${@dict.getType('sys_file_extract')}]];
var destoryStateDatas = [[${@dict.getType('sys_destory_state')}]];
var prefix = ctx + "system/filereceive";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "涉密文件接收",
columns: [{
checkbox: true
},
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "涉密文件接收",
columns: [{
checkbox: true
},
{
field: 'receiveId',
title: '接收编号',
@ -116,6 +78,18 @@
field: 'fileId',
title: '文件编号'
},
{
field: 'fileName',
title: '文件名称'
},
{
field: 'provideDepart',
title: '发文单位'
},
{
field: 'provideDate',
title: '发文日期'
},
{
field: 'receiveDepartid',
title: '接收单位'
@ -124,7 +98,7 @@
field: 'receiveState',
title: '接收状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(receiveStateDatas, value);
return $.table.selectDictLabel(receiveStateDatas, value);
}
},
{
@ -135,32 +109,6 @@
field: 'receiveDate',
title: '接收日期'
},
{
field: 'extractState',
title: '提取状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(extractStateDatas, value);
}
},
{
field: 'extractDepartid',
title: '提取单位'
},
{
field: 'extractUserid',
title: '提取人员'
},
{
field: 'extractDate',
title: '提取日期'
},
{
field: 'destoryState',
title: '销毁状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(destoryStateDatas, value);
}
},
{
title: '操作',
align: 'center',
@ -171,9 +119,9 @@
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
};
$.table.init(options);
});
</script>
</body>
</html>

44
ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java
Unescape View File

@ -24,6 +24,19 @@ public class TdFileReceive extends BaseEntity
@Excel(name = "文件编号")
private String fileId;
/** 文件名称 */
@Excel(name = "文件名称")
private String fileName;
/** 发文单位 */
@Excel(name = "发文单位")
private String provideDepart;
/** 发文日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "发文日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date provideDate;
/** 接收单位 */
@Excel(name = "接收单位")
private String receiveDepartid;
@ -80,6 +93,34 @@ public class TdFileReceive extends BaseEntity
{
return fileId;
}
public void setFileName(String fileName)
{
this.fileName = fileName;
}
public String getFileName()
{
return fileName;
}
public void setProvideDepart(String provideDepart)
{
this.provideDepart = provideDepart;
}
public String getProvideDepart()
{
return provideDepart;
}
public void setProvideDate(Date provideDate)
{
this.provideDate = provideDate;
}
public Date getProvideDate()
{
return provideDate;
}
public void setReceiveDepartid(String receiveDepartid)
{
this.receiveDepartid = receiveDepartid;
@ -167,6 +208,9 @@ public class TdFileReceive extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("receiveId", getReceiveId())
.append("fileId", getFileId())
.append("fileName", getFileName())
.append("provideDepart", getProvideDepart())
.append("provideDate", getProvideDate())
.append("receiveDepartid", getReceiveDepartid())
.append("receiveState", getReceiveState())
.append("receiveUserid", getReceiveUserid())

17
ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml
Unescape View File

@ -7,6 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="TdFileReceive" id="TdFileReceiveResult">
<result property="receiveId" column="receive_id" />
<result property="fileId" column="file_id" />
<result property="fileName" column="file_name" />
<result property="provideDepart" column="provide_depart" />
<result property="provideDate" column="provide_date" />
<result property="receiveDepartid" column="receive_departid" />
<result property="receiveState" column="receive_state" />
<result property="receiveUserid" column="receive_userid" />
@ -19,13 +22,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTdFileReceiveVo">
select receive_id, file_id, receive_departid, receive_state, receive_userid, receive_date, extract_state, extract_departid, extract_userid, extract_date, destory_state from td_file_receive
select receive_id, file_id, file_name, provide_depart, provide_date, receive_departid, receive_state, receive_userid, receive_date, extract_state, extract_departid, extract_userid, extract_date, destory_state from td_file_receive
</sql>
<select id="selectTdFileReceiveList" parameterType="TdFileReceive" resultMap="TdFileReceiveResult">
<include refid="selectTdFileReceiveVo"/>
<where>
<if test="fileId != null and fileId != ''"> and file_id = #{fileId}</if>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="provideDepart != null and provideDepart != ''"> and provide_depart = #{provideDepart}</if>
<if test="provideDate != null "> and provide_date = #{provideDate}</if>
<if test="receiveDepartid != null and receiveDepartid != ''"> and receive_departid = #{receiveDepartid}</if>
<if test="receiveState != null and receiveState != ''"> and receive_state = #{receiveState}</if>
<if test="receiveUserid != null and receiveUserid != ''"> and receive_userid = #{receiveUserid}</if>
@ -47,6 +53,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into td_file_receive
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fileId != null">file_id,</if>
<if test="fileName != null">file_name,</if>
<if test="provideDepart != null">provide_depart,</if>
<if test="provideDate != null">provide_date,</if>
<if test="receiveDepartid != null">receive_departid,</if>
<if test="receiveState != null">receive_state,</if>
<if test="receiveUserid != null">receive_userid,</if>
@ -59,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fileId != null">#{fileId},</if>
<if test="fileName != null">#{fileName},</if>
<if test="provideDepart != null">#{provideDepart},</if>
<if test="provideDate != null">#{provideDate},</if>
<if test="receiveDepartid != null">#{receiveDepartid},</if>
<if test="receiveState != null">#{receiveState},</if>
<if test="receiveUserid != null">#{receiveUserid},</if>
@ -75,6 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update td_file_receive
<trim prefix="SET" suffixOverrides=",">
<if test="fileId != null">file_id = #{fileId},</if>
<if test="fileName != null">file_name = #{fileName},</if>
<if test="provideDepart != null">provide_depart = #{provideDepart},</if>
<if test="provideDate != null">provide_date = #{provideDate},</if>
<if test="receiveDepartid != null">receive_departid = #{receiveDepartid},</if>
<if test="receiveState != null">receive_state = #{receiveState},</if>
<if test="receiveUserid != null">receive_userid = #{receiveUserid},</if>

Write Preview
Loading…
Cancel
Save