涉密文件销毁,统计

master
20918 1 year ago
parent 8a99fb4cfe
commit 63780c7f9e

@ -57,7 +57,9 @@ public class SysFilenumController extends BaseController {
public String print(@PathVariable("fileId") String fileId, ModelMap mmap) public String print(@PathVariable("fileId") String fileId, ModelMap mmap)
{ {
List<TdFileReceive> tdFileReceives = tdFileReceiveService.selectTdFileReceiveByFileId(fileId); List<TdFileReceive> tdFileReceives = tdFileReceiveService.selectTdFileReceiveByFileId(fileId);
TdFileProvide tdFileProvide = tdFileProvideService.selectTdFileProvideByFileId(fileId);
mmap.put("tdFileReceives", tdFileReceives); mmap.put("tdFileReceives", tdFileReceives);
mmap.put("tdFileProvide", tdFileProvide);
return prefix + "/print"; return prefix + "/print";
} }
} }

@ -53,7 +53,9 @@ public class SysNetworknumController extends BaseController {
public String print(@PathVariable("netId") String netId, ModelMap mmap) public String print(@PathVariable("netId") String netId, ModelMap mmap)
{ {
List<TdPropertyNetinfo> tdPropertyNetinfos = tdPropertyNetinfoService.selectTdPropertyNetinfoByNetId(netId); List<TdPropertyNetinfo> tdPropertyNetinfos = tdPropertyNetinfoService.selectTdPropertyNetinfoByNetId(netId);
TdPropertyNet tdPropertyNet = tdPropertyNetService.selectTdPropertyNetByNetId(netId);
mmap.put("tdPropertyNetinfos", tdPropertyNetinfos); mmap.put("tdPropertyNetinfos", tdPropertyNetinfos);
mmap.put("tdPropertyNet", tdPropertyNet);
return prefix + "/print"; return prefix + "/print";
} }

@ -51,7 +51,9 @@ public class SysPropertynumController extends BaseController {
public String print(@PathVariable("useId") String useId, ModelMap mmap) public String print(@PathVariable("useId") String useId, ModelMap mmap)
{ {
List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoByUseId(useId); List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoByUseId(useId);
TdPropertyManager tdPropertyManager = tdPropertyManagerService.selectTdPropertyManagerByUseId(useId);
mmap.put("tdPropertyInfos", tdPropertyInfos); mmap.put("tdPropertyInfos", tdPropertyInfos);
mmap.put("tdPropertyManager", tdPropertyManager);
return prefix + "/print"; return prefix + "/print";
} }
} }

@ -5,6 +5,7 @@ import java.util.List;
import com.ruoyi.system.domain.TdFileProvide; import com.ruoyi.system.domain.TdFileProvide;
import com.ruoyi.system.domain.TdFileReceive; import com.ruoyi.system.domain.TdFileReceive;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ITdFileProvideService; import com.ruoyi.system.service.ITdFileProvideService;
import com.ruoyi.system.service.ITdFileReceiveService; import com.ruoyi.system.service.ITdFileReceiveService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -14,8 +15,6 @@ import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.TdFileDestory;
import com.ruoyi.system.service.ITdFileDestoryService;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
@ -33,12 +32,12 @@ public class TdFileDestoryController extends BaseController
{ {
private String prefix = "system/filedestory"; private String prefix = "system/filedestory";
@Autowired
private ITdFileDestoryService tdFileDestoryService;
@Autowired @Autowired
private ITdFileReceiveService tdFileReceiveService; private ITdFileReceiveService tdFileReceiveService;
@Autowired @Autowired
private ITdFileProvideService tdFileProvideService; private ITdFileProvideService tdFileProvideService;
@Autowired
private ISysDeptService deptService;
@RequiresPermissions("system:filedestory:view") @RequiresPermissions("system:filedestory:view")
@GetMapping() @GetMapping()
@ -53,19 +52,18 @@ public class TdFileDestoryController extends BaseController
@RequiresPermissions("system:filedestory:list") @RequiresPermissions("system:filedestory:list")
@PostMapping("/list") @PostMapping("/list")
@ResponseBody @ResponseBody
public TableDataInfo list(TdFileDestory tdFileDestory,ModelMap mmap) public TableDataInfo list(TdFileReceive tdFileReceive)
{ {
startPage(); startPage();
List<TdFileDestory> list = tdFileDestoryService.selectTdFileDestoryList(tdFileDestory); List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
List<TdFileReceive> tdFileReceiveList = new ArrayList<>(); List<TdFileReceive> tdFileReceives = new ArrayList<>();
List<List> list1 = new ArrayList<>(); for (TdFileReceive FileReceivelist : list){
for (TdFileDestory tdFileDestorylist : list){ if (FileReceivelist.getExtractState().equals("1") && FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){
TdFileReceive tdFileReceive = tdFileReceiveService.selectTdFileReceiveByReceiveId(tdFileDestorylist.getReceiveId()); tdFileReceives.add(FileReceivelist);
tdFileReceiveList.add(tdFileReceive);
} }
list1.add(list); }
list1.add(tdFileReceiveList);
return getDataTable(list1); return getDataTable(tdFileReceives);
} }
/** /**
@ -75,10 +73,10 @@ public class TdFileDestoryController extends BaseController
@Log(title = "涉密文件销毁", businessType = BusinessType.EXPORT) @Log(title = "涉密文件销毁", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
@ResponseBody @ResponseBody
public AjaxResult export(TdFileDestory tdFileDestory) public AjaxResult export(TdFileReceive tdFileReceive)
{ {
List<TdFileDestory> list = tdFileDestoryService.selectTdFileDestoryList(tdFileDestory); List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
ExcelUtil<TdFileDestory> util = new ExcelUtil<TdFileDestory>(TdFileDestory.class); ExcelUtil<TdFileReceive> util = new ExcelUtil<TdFileReceive>(TdFileReceive.class);
return util.exportExcel(list, "涉密文件销毁数据"); return util.exportExcel(list, "涉密文件销毁数据");
} }
@ -86,14 +84,14 @@ public class TdFileDestoryController extends BaseController
* *
*/ */
@RequiresPermissions("system:filedestory:edit") @RequiresPermissions("system:filedestory:edit")
@GetMapping("/edit/{destoryId}") @GetMapping("/edit/{receiveId}")
public String edit(@PathVariable("destoryId") Long destoryId, ModelMap mmap) public String edit(@PathVariable("receiveId") Long receiveId, ModelMap mmap)
{ {
TdFileDestory tdFileDestory = tdFileDestoryService.selectTdFileDestoryByDestoryId(destoryId); TdFileReceive tdFileReceive = tdFileReceiveService.selectTdFileReceiveByReceiveId(receiveId);
String fileId = (tdFileReceiveService.selectTdFileReceiveByReceiveId(tdFileDestory.getReceiveId())).getFileId(); String fileId = tdFileReceive.getFileId();
TdFileProvide tdFileProvide = tdFileProvideService.selectTdFileProvideByFileId(fileId); TdFileProvide tdFileProvide = tdFileProvideService.selectTdFileProvideByFileId(fileId);
mmap.put("tdFileProvide", tdFileProvide); mmap.put("tdFileProvide", tdFileProvide);
mmap.put("tdFileDestory", tdFileDestory); mmap.put("tdFileReceive", tdFileReceive);
return prefix + "/edit"; return prefix + "/edit";
} }
@ -104,35 +102,23 @@ public class TdFileDestoryController extends BaseController
@Log(title = "涉密文件销毁", businessType = BusinessType.UPDATE) @Log(title = "涉密文件销毁", businessType = BusinessType.UPDATE)
@PostMapping("/edit") @PostMapping("/edit")
@ResponseBody @ResponseBody
public AjaxResult editSave(TdFileDestory tdFileDestory) public AjaxResult editSave(TdFileReceive tdFileReceive)
{
return toAjax(tdFileDestoryService.updateTdFileDestory(tdFileDestory));
}
/**
*
*/
@RequiresPermissions("system:filedestory:remove")
@Log(title = "涉密文件销毁", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{ {
return toAjax(tdFileDestoryService.deleteTdFileDestoryByDestoryIds(ids)); return toAjax(tdFileReceiveService.updateTdFileReceive(tdFileReceive));
} }
/** /**
* *
*/ */
@RequiresPermissions("system:filedestory:detail") @RequiresPermissions("system:filedestory:detail")
@GetMapping("/detail/{destoryId}") @GetMapping("/detail/{receiveId}")
public String detail(@PathVariable("destoryId") Long destoryId, ModelMap mmap) public String detail(@PathVariable("receiveId") Long receiveId, ModelMap mmap)
{ {
TdFileDestory tdFileDestory = tdFileDestoryService.selectTdFileDestoryByDestoryId(destoryId); TdFileReceive tdFileReceive = tdFileReceiveService.selectTdFileReceiveByReceiveId(receiveId);
String fileId = (tdFileReceiveService.selectTdFileReceiveByReceiveId(tdFileDestory.getReceiveId())).getFileId(); String fileId = tdFileReceive.getFileId();
TdFileProvide tdFileProvide = tdFileProvideService.selectTdFileProvideByFileId(fileId); TdFileProvide tdFileProvide = tdFileProvideService.selectTdFileProvideByFileId(fileId);
mmap.put("tdFileProvide", tdFileProvide); mmap.put("tdFileProvide", tdFileProvide);
mmap.put("tdFileDestory", tdFileDestory); mmap.put("tdFileReceive", tdFileReceive);
return prefix + "/detail"; return prefix + "/detail";
} }

@ -6,10 +6,8 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.TdFileDestory;
import com.ruoyi.system.domain.TdFileReceive; import com.ruoyi.system.domain.TdFileReceive;
import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ITdFileDestoryService;
import com.ruoyi.system.service.ITdFileReceiveService; import com.ruoyi.system.service.ITdFileReceiveService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -31,9 +29,6 @@ public class TdFileExtractController extends BaseController {
private ITdFileReceiveService tdFileReceiveService; private ITdFileReceiveService tdFileReceiveService;
@Autowired @Autowired
private ISysDeptService deptService; private ISysDeptService deptService;
@Autowired
private ITdFileDestoryService tdFileDestoryService;
@RequiresPermissions("system:fileextract:view") @RequiresPermissions("system:fileextract:view")
@GetMapping() @GetMapping()
@ -98,12 +93,6 @@ public class TdFileExtractController extends BaseController {
@ResponseBody @ResponseBody
public AjaxResult editSave(TdFileReceive tdFileReceive) public AjaxResult editSave(TdFileReceive tdFileReceive)
{ {
TdFileDestory tdFileDestory = new TdFileDestory();
if (tdFileReceive.getExtractState().equals("1")){
tdFileDestory.setReceiveId(tdFileReceive.getReceiveId());
tdFileDestory.setDestoryFilename(tdFileReceive.getFileName());
tdFileDestoryService.insertTdFileDestory(tdFileDestory);
}
return toAjax(tdFileReceiveService.updateTdFileReceive(tdFileReceive)); return toAjax(tdFileReceiveService.updateTdFileReceive(tdFileReceive));
} }

@ -1,39 +1,69 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('修改涉密文件销毁')" /> <th:block th:include="include :: header('修改涉密文件接收')" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-filedestory-edit" th:object="${tdFileDestory}"> <form class="form-horizontal m" id="form-filereceive-edit" th:object="${tdFileReceive}">
<input name="destoryId" th:field="*{destoryId}" type="hidden"> <input name="receiveId" th:field="*{receiveId}" type="hidden">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">接收id</label> <label class="col-sm-3 control-label">文件编号</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="receiveId" th:field="*{receiveId}" class="form-control" type="text"> <input name="fileId" disabled th:field="*{fileId}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">文件名:</label> <label class="col-sm-3 control-label">文件名</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="destoryFilename" th:field="*{destoryFilename}" class="form-control" type="text"> <input name="fileName" disabled th:field="*{fileName}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">销毁地点</label> <label class="col-sm-3 control-label">发文单位</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="destoryAddress" class="form-control">[[*{destoryAddress}]]</textarea> <input name="provideDepart" disabled th:field="*{provideDepart}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">销毁数量</label> <label class="col-sm-3 control-label">发文日期</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="destoryCount" th:field="*{destoryCount}" class="form-control" type="text"> <div class="input-group date">
<input name="provideDate" disabled 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>
<div class="form-group">
<label class="col-sm-3 control-label">提取单位:</label>
<div class="col-sm-8">
<input name="extractDepartid" disabled 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">
<div class="input-group date">
<input name="extractDate" disabled 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="destoryState" th:field="*{destoryState}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">销毁单位:</label> <label class="col-sm-3 control-label">销毁地点:</label>
<div class="col-sm-8">
<input name="destoryAddress" th:field="*{destoryAddress}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">销毁部门:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="destoryDepart" th:field="*{destoryDepart}" class="form-control" type="text"> <input name="destoryDepart" th:field="*{destoryDepart}" class="form-control" type="text">
</div> </div>
@ -50,11 +80,17 @@
<input name="destoryStyle" th:field="*{destoryStyle}" class="form-control" type="text"> <input name="destoryStyle" th:field="*{destoryStyle}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">销毁数量:</label>
<div class="col-sm-8">
<input name="destoryCount" th:field="*{destoryCount}" class="form-control" type="text">
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">销毁日期:</label> <label class="col-sm-3 control-label">销毁日期:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <div class="input-group date">
<input name="destoryDate" th:value="${#dates.format(tdFileDestory.destoryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> <input name="destoryDate" th:value="${#dates.format(tdFileReceive.destoryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
@ -70,17 +106,35 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "system/filedestory"; var prefix = ctx + "system/filereceive";
$("#form-filedestory-edit").validate({ $("#form-filereceive-edit").validate({
focusCleanup: true focusCleanup: true
}); });
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-filedestory-edit').serialize()); $.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='extractDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='destoryDate']").datetimepicker({ $("input[name='destoryDate']").datetimepicker({
format: "yyyy-mm-dd", format: "yyyy-mm-dd",
minView: "month", minView: "month",

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('涉密文件销毁列表')" /> <th:block th:include="include :: header('涉密文件接收列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
@ -10,13 +10,18 @@
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li>
<label>文件名称:</label>
<input type="text" name="fileName"/>
</li>
<li> <li>
<label>文件名:</label> <label>发文单位</label>
<input type="text" name="destoryFilename"/> <input type="text" name="provideDepart"/>
</li> </li>
<li> <li>
<label>销毁单位</label> <label>销毁状态</label>
<input type="text" name="destoryDepart"/> <input type="text" name="destoryState"/>
</li> </li>
<li> <li>
<label>销毁方式:</label> <label>销毁方式:</label>
@ -32,10 +37,7 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:filedestory:remove"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:filereceive:export">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:filedestory:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
@ -46,9 +48,12 @@
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:filedestory:edit')}]]; var editFlag = [[${@permission.hasPermi('system:filereceive:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:filedestory:remove')}]]; var removeFlag = [[${@permission.hasPermi('system:filereceive:remove')}]];
var prefix = ctx + "system/filedestory"; 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() { $(function() {
var options = { var options = {
@ -57,43 +62,50 @@
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "涉密文件销毁", modalName: "涉密文件接收",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{ {
field: 'destoryId', field: 'receiveId',
title: 'id', title: '接收编号',
visible: false visible: false
}, },
{ {
field: 'receiveId', field: 'fileName',
title: '接收id' title: '文件名称'
},
{
field: 'provideDepart',
title: '发文单位'
}, },
{ {
field: 'destoryFilename', field: 'extractDepartid',
title: '文件名' title: '提取单位'
}, },
{ {
field: 'destoryAddress', field: 'extractUserid',
title: '销毁地点' title: '提取人员'
}, },
{ {
field: 'destoryCount', field: 'extractDate',
title: '销毁数量' title: '提取日期'
},
{
field: 'destoryState',
title: '销毁状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(destoryStateDatas, value);
}
}, },
{ {
field: 'destoryDepart', field: 'destoryDepart',
title: '销毁单位' title: '销毁部门'
}, },
{ {
field: 'destoryUsername', field: 'destoryUsername',
title: '销毁人员' title: '销毁人员'
}, },
{
field: 'destoryStyle',
title: '销毁方式'
},
{ {
field: 'destoryDate', field: 'destoryDate',
title: '销毁日期' title: '销毁日期'
@ -107,9 +119,8 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.destoryId + '\')"><i class="fa fa-remove"></i>详情</a>'); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.receiveId + '\')"><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.destoryId + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>销毁</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.destoryId + '\')"><i class="fa fa-edit"></i>销毁</a> ');
return actions.join(''); return actions.join('');
} }
}] }]

@ -1,153 +0,0 @@
package com.ruoyi.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* td_file_destory
*
* @author ruoyi
* @date 2024-05-15
*/
public class TdFileDestory extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private Long destoryId;
/** 接收id */
@Excel(name = "接收id")
private Long receiveId;
/** 文件名 */
@Excel(name = "文件名")
private String destoryFilename;
/** 销毁地点 */
@Excel(name = "销毁地点")
private String destoryAddress;
/** 销毁数量 */
@Excel(name = "销毁数量")
private Long destoryCount;
/** 销毁单位 */
@Excel(name = "销毁单位")
private String destoryDepart;
/** 销毁人员 */
@Excel(name = "销毁人员")
private String destoryUsername;
/** 销毁方式 */
@Excel(name = "销毁方式")
private String destoryStyle;
/** 销毁日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "销毁日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date destoryDate;
public void setDestoryId(Long destoryId)
{
this.destoryId = destoryId;
}
public Long getDestoryId()
{
return destoryId;
}
public void setReceiveId(Long receiveId)
{
this.receiveId = receiveId;
}
public Long getReceiveId()
{
return receiveId;
}
public void setDestoryFilename(String destoryFilename)
{
this.destoryFilename = destoryFilename;
}
public String getDestoryFilename()
{
return destoryFilename;
}
public void setDestoryAddress(String destoryAddress)
{
this.destoryAddress = destoryAddress;
}
public String getDestoryAddress()
{
return destoryAddress;
}
public void setDestoryCount(Long destoryCount)
{
this.destoryCount = destoryCount;
}
public Long getDestoryCount()
{
return destoryCount;
}
public void setDestoryDepart(String destoryDepart)
{
this.destoryDepart = destoryDepart;
}
public String getDestoryDepart()
{
return destoryDepart;
}
public void setDestoryUsername(String destoryUsername)
{
this.destoryUsername = destoryUsername;
}
public String getDestoryUsername()
{
return destoryUsername;
}
public void setDestoryStyle(String destoryStyle)
{
this.destoryStyle = destoryStyle;
}
public String getDestoryStyle()
{
return destoryStyle;
}
public void setDestoryDate(Date destoryDate)
{
this.destoryDate = destoryDate;
}
public Date getDestoryDate()
{
return destoryDate;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("destoryId", getDestoryId())
.append("receiveId", getReceiveId())
.append("destoryFilename", getDestoryFilename())
.append("destoryAddress", getDestoryAddress())
.append("destoryCount", getDestoryCount())
.append("destoryDepart", getDestoryDepart())
.append("destoryUsername", getDestoryUsername())
.append("destoryStyle", getDestoryStyle())
.append("destoryDate", getDestoryDate())
.append("remark", getRemark())
.toString();
}
}

@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* td_file_receive * td_file_receive
* *
* @author ruoyi * @author ruoyi
* @date 2024-05-14 * @date 2024-05-16
*/ */
public class TdFileReceive extends BaseEntity public class TdFileReceive extends BaseEntity
{ {
@ -75,6 +75,45 @@ public class TdFileReceive extends BaseEntity
@Excel(name = "销毁状态") @Excel(name = "销毁状态")
private String destoryState; private String destoryState;
/** 销毁地点 */
@Excel(name = "销毁地点")
private String destoryAddress;
/** 销毁部门 */
@Excel(name = "销毁部门")
private String destoryDepart;
/** 销毁人员 */
@Excel(name = "销毁人员")
private String destoryUsername;
/** 销毁方式 */
@Excel(name = "销毁方式")
private String destoryStyle;
/** 销毁数量 */
@Excel(name = "销毁数量")
private Long destoryCount;
/** 销毁日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "销毁日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date destoryDate;
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
/** 备注 */
@Excel(name = "备注")
private String remark;
public void setReceiveId(Long receiveId) public void setReceiveId(Long receiveId)
{ {
this.receiveId = receiveId; this.receiveId = receiveId;
@ -93,7 +132,6 @@ public class TdFileReceive extends BaseEntity
{ {
return fileId; return fileId;
} }
public void setFileName(String fileName) public void setFileName(String fileName)
{ {
this.fileName = fileName; this.fileName = fileName;
@ -202,6 +240,60 @@ public class TdFileReceive extends BaseEntity
{ {
return destoryState; return destoryState;
} }
public void setDestoryAddress(String destoryAddress)
{
this.destoryAddress = destoryAddress;
}
public String getDestoryAddress()
{
return destoryAddress;
}
public void setDestoryDepart(String destoryDepart)
{
this.destoryDepart = destoryDepart;
}
public String getDestoryDepart()
{
return destoryDepart;
}
public void setDestoryUsername(String destoryUsername)
{
this.destoryUsername = destoryUsername;
}
public String getDestoryUsername()
{
return destoryUsername;
}
public void setDestoryStyle(String destoryStyle)
{
this.destoryStyle = destoryStyle;
}
public String getDestoryStyle()
{
return destoryStyle;
}
public void setDestoryCount(Long destoryCount)
{
this.destoryCount = destoryCount;
}
public Long getDestoryCount()
{
return destoryCount;
}
public void setDestoryDate(Date destoryDate)
{
this.destoryDate = destoryDate;
}
public Date getDestoryDate()
{
return destoryDate;
}
@Override @Override
public String toString() { public String toString() {
@ -220,6 +312,13 @@ public class TdFileReceive extends BaseEntity
.append("extractUserid", getExtractUserid()) .append("extractUserid", getExtractUserid())
.append("extractDate", getExtractDate()) .append("extractDate", getExtractDate())
.append("destoryState", getDestoryState()) .append("destoryState", getDestoryState())
.append("destoryAddress", getDestoryAddress())
.append("destoryDepart", getDestoryDepart())
.append("destoryUsername", getDestoryUsername())
.append("destoryStyle", getDestoryStyle())
.append("destoryCount", getDestoryCount())
.append("destoryDate", getDestoryDate())
.append("remark", getRemark())
.toString(); .toString();
} }
} }

@ -1,61 +0,0 @@
package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.TdFileDestory;
/**
* Mapper
*
* @author ruoyi
* @date 2024-05-15
*/
public interface TdFileDestoryMapper
{
/**
*
*
* @param destoryId
* @return
*/
public TdFileDestory selectTdFileDestoryByDestoryId(Long destoryId);
/**
*
*
* @param tdFileDestory
* @return
*/
public List<TdFileDestory> selectTdFileDestoryList(TdFileDestory tdFileDestory);
/**
*
*
* @param tdFileDestory
* @return
*/
public int insertTdFileDestory(TdFileDestory tdFileDestory);
/**
*
*
* @param tdFileDestory
* @return
*/
public int updateTdFileDestory(TdFileDestory tdFileDestory);
/**
*
*
* @param destoryId
* @return
*/
public int deleteTdFileDestoryByDestoryId(Long destoryId);
/**
*
*
* @param destoryIds
* @return
*/
public int deleteTdFileDestoryByDestoryIds(String[] destoryIds);
}

@ -1,61 +0,0 @@
package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.system.domain.TdFileDestory;
/**
* Service
*
* @author ruoyi
* @date 2024-05-15
*/
public interface ITdFileDestoryService
{
/**
*
*
* @param destoryId
* @return
*/
public TdFileDestory selectTdFileDestoryByDestoryId(Long destoryId);
/**
*
*
* @param tdFileDestory
* @return
*/
public List<TdFileDestory> selectTdFileDestoryList(TdFileDestory tdFileDestory);
/**
*
*
* @param tdFileDestory
* @return
*/
public int insertTdFileDestory(TdFileDestory tdFileDestory);
/**
*
*
* @param tdFileDestory
* @return
*/
public int updateTdFileDestory(TdFileDestory tdFileDestory);
/**
*
*
* @param destoryIds
* @return
*/
public int deleteTdFileDestoryByDestoryIds(String destoryIds);
/**
*
*
* @param destoryId
* @return
*/
public int deleteTdFileDestoryByDestoryId(Long destoryId);
}

@ -1,94 +0,0 @@
package com.ruoyi.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.TdFileDestoryMapper;
import com.ruoyi.system.domain.TdFileDestory;
import com.ruoyi.system.service.ITdFileDestoryService;
import com.ruoyi.common.core.text.Convert;
/**
* Service
*
* @author ruoyi
* @date 2024-05-15
*/
@Service
public class TdFileDestoryServiceImpl implements ITdFileDestoryService
{
@Autowired
private TdFileDestoryMapper tdFileDestoryMapper;
/**
*
*
* @param destoryId
* @return
*/
@Override
public TdFileDestory selectTdFileDestoryByDestoryId(Long destoryId)
{
return tdFileDestoryMapper.selectTdFileDestoryByDestoryId(destoryId);
}
/**
*
*
* @param tdFileDestory
* @return
*/
@Override
public List<TdFileDestory> selectTdFileDestoryList(TdFileDestory tdFileDestory)
{
return tdFileDestoryMapper.selectTdFileDestoryList(tdFileDestory);
}
/**
*
*
* @param tdFileDestory
* @return
*/
@Override
public int insertTdFileDestory(TdFileDestory tdFileDestory)
{
return tdFileDestoryMapper.insertTdFileDestory(tdFileDestory);
}
/**
*
*
* @param tdFileDestory
* @return
*/
@Override
public int updateTdFileDestory(TdFileDestory tdFileDestory)
{
return tdFileDestoryMapper.updateTdFileDestory(tdFileDestory);
}
/**
*
*
* @param destoryIds
* @return
*/
@Override
public int deleteTdFileDestoryByDestoryIds(String destoryIds)
{
return tdFileDestoryMapper.deleteTdFileDestoryByDestoryIds(Convert.toStrArray(destoryIds));
}
/**
*
*
* @param destoryId
* @return
*/
@Override
public int deleteTdFileDestoryByDestoryId(Long destoryId)
{
return tdFileDestoryMapper.deleteTdFileDestoryByDestoryId(destoryId);
}
}

@ -1,97 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.TdFileDestoryMapper">
<resultMap type="TdFileDestory" id="TdFileDestoryResult">
<result property="destoryId" column="destory_id" />
<result property="receiveId" column="receive_id" />
<result property="destoryFilename" column="destory_filename" />
<result property="destoryAddress" column="destory_address" />
<result property="destoryCount" column="destory_count" />
<result property="destoryDepart" column="destory_depart" />
<result property="destoryUsername" column="destory_username" />
<result property="destoryStyle" column="destory_style" />
<result property="destoryDate" column="destory_date" />
<result property="remark" column="remark" />
<!-- <collection property="TdFileReceive" ofType="com.ruoyi.system.domain.TdFileReceive" resultMap="TdFileReceiveResult" />-->
</resultMap>
<sql id="selectTdFileDestoryVo">
select destory_id, receive_id, destory_filename, destory_address, destory_count, destory_depart, destory_username, destory_style, destory_date, remark from td_file_destory
</sql>
<select id="selectTdFileDestoryList" parameterType="TdFileDestory" resultMap="TdFileDestoryResult">
<include refid="selectTdFileDestoryVo"/>
<where>
<if test="receiveId != null and receiveId != ''"> and receive_id = #{receiveId}</if>
<if test="destoryFilename != null and destoryFilename != ''"> and destory_filename like concat('%', #{destoryFilename}, '%')</if>
<if test="destoryAddress != null and destoryAddress != ''"> and destory_address = #{destoryAddress}</if>
<if test="destoryCount != null "> and destory_count = #{destoryCount}</if>
<if test="destoryDepart != null and destoryDepart != ''"> and destory_depart = #{destoryDepart}</if>
<if test="destoryUsername != null and destoryUsername != ''"> and destory_username like concat('%', #{destoryUsername}, '%')</if>
<if test="destoryStyle != null and destoryStyle != ''"> and destory_style = #{destoryStyle}</if>
<if test="destoryDate != null "> and destory_date = #{destoryDate}</if>
</where>
</select>
<select id="selectTdFileDestoryByDestoryId" parameterType="Long" resultMap="TdFileDestoryResult">
<include refid="selectTdFileDestoryVo"/>
where destory_id = #{destoryId}
</select>
<insert id="insertTdFileDestory" parameterType="TdFileDestory" useGeneratedKeys="true" keyProperty="destoryId">
insert into td_file_destory
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="receiveId != null">receive_id,</if>
<if test="destoryFilename != null">destory_filename,</if>
<if test="destoryAddress != null">destory_address,</if>
<if test="destoryCount != null">destory_count,</if>
<if test="destoryDepart != null">destory_depart,</if>
<if test="destoryUsername != null">destory_username,</if>
<if test="destoryStyle != null">destory_style,</if>
<if test="destoryDate != null">destory_date,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="receiveId != null">#{receiveId},</if>
<if test="destoryFilename != null">#{destoryFilename},</if>
<if test="destoryAddress != null">#{destoryAddress},</if>
<if test="destoryCount != null">#{destoryCount},</if>
<if test="destoryDepart != null">#{destoryDepart},</if>
<if test="destoryUsername != null">#{destoryUsername},</if>
<if test="destoryStyle != null">#{destoryStyle},</if>
<if test="destoryDate != null">#{destoryDate},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateTdFileDestory" parameterType="TdFileDestory">
update td_file_destory
<trim prefix="SET" suffixOverrides=",">
<if test="receiveId != null">receive_id = #{receiveId},</if>
<if test="destoryFilename != null">destory_filename = #{destoryFilename},</if>
<if test="destoryAddress != null">destory_address = #{destoryAddress},</if>
<if test="destoryCount != null">destory_count = #{destoryCount},</if>
<if test="destoryDepart != null">destory_depart = #{destoryDepart},</if>
<if test="destoryUsername != null">destory_username = #{destoryUsername},</if>
<if test="destoryStyle != null">destory_style = #{destoryStyle},</if>
<if test="destoryDate != null">destory_date = #{destoryDate},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where destory_id = #{destoryId}
</update>
<delete id="deleteTdFileDestoryByDestoryId" parameterType="Long">
delete from td_file_destory where destory_id = #{destoryId}
</delete>
<delete id="deleteTdFileDestoryByDestoryIds" parameterType="String">
delete from td_file_destory where destory_id in
<foreach item="destoryId" collection="array" open="(" separator="," close=")">
#{destoryId}
</foreach>
</delete>
</mapper>

@ -19,10 +19,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="extractUserid" column="extract_userid" /> <result property="extractUserid" column="extract_userid" />
<result property="extractDate" column="extract_date" /> <result property="extractDate" column="extract_date" />
<result property="destoryState" column="destory_state" /> <result property="destoryState" column="destory_state" />
<result property="destoryAddress" column="destory_address" />
<result property="destoryDepart" column="destory_depart" />
<result property="destoryUsername" column="destory_username" />
<result property="destoryStyle" column="destory_style" />
<result property="destoryCount" column="destory_count" />
<result property="destoryDate" column="destory_date" />
<result property="remark" column="remark" />
</resultMap> </resultMap>
<sql id="selectTdFileReceiveVo"> <sql id="selectTdFileReceiveVo">
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 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,destory_address, destory_depart, destory_username, destory_style, destory_count, destory_date, remark from td_file_receive
</sql> </sql>
<select id="selectTdFileReceiveList" parameterType="TdFileReceive" resultMap="TdFileReceiveResult"> <select id="selectTdFileReceiveList" parameterType="TdFileReceive" resultMap="TdFileReceiveResult">
@ -41,6 +48,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="extractUserid != null and extractUserid != ''"> and extract_userid = #{extractUserid}</if> <if test="extractUserid != null and extractUserid != ''"> and extract_userid = #{extractUserid}</if>
<if test="extractDate != null "> and extract_date = #{extractDate}</if> <if test="extractDate != null "> and extract_date = #{extractDate}</if>
<if test="destoryState != null and destoryState != ''"> and destory_state = #{destoryState}</if> <if test="destoryState != null and destoryState != ''"> and destory_state = #{destoryState}</if>
<if test="destoryAddress != null and destoryAddress != ''"> and destory_address = #{destoryAddress}</if>
<if test="destoryDepart != null and destoryDepart != ''"> and destory_depart = #{destoryDepart}</if>
<if test="destoryUsername != null and destoryUsername != ''"> and destory_username like concat('%', #{destoryUsername}, '%')</if>
<if test="destoryStyle != null and destoryStyle != ''"> and destory_style = #{destoryStyle}</if>
<if test="destoryCount != null "> and destory_count = #{destoryCount}</if>
<if test="destoryDate != null "> and destory_date = #{destoryDate}</if>
<if test="remark != null "> and remark = #{remark}</if>
</where> </where>
</select> </select>
@ -75,6 +90,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="extractUserid != null">extract_userid,</if> <if test="extractUserid != null">extract_userid,</if>
<if test="extractDate != null">extract_date,</if> <if test="extractDate != null">extract_date,</if>
<if test="destoryState != null">destory_state,</if> <if test="destoryState != null">destory_state,</if>
<if test="destoryAddress != null">destory_address,</if>
<if test="destoryDepart != null">destory_depart,</if>
<if test="destoryUsername != null">destory_username,</if>
<if test="destoryStyle != null">destory_style,</if>
<if test="destoryCount != null">destory_count,</if>
<if test="destoryDate != null">destory_date,</if>
<if test="remark != null">remark,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fileId != null">#{fileId},</if> <if test="fileId != null">#{fileId},</if>
@ -90,6 +112,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="extractUserid != null">#{extractUserid},</if> <if test="extractUserid != null">#{extractUserid},</if>
<if test="extractDate != null">#{extractDate},</if> <if test="extractDate != null">#{extractDate},</if>
<if test="destoryState != null">#{destoryState},</if> <if test="destoryState != null">#{destoryState},</if>
<if test="destoryAddress != null">#{destoryAddress},</if>
<if test="destoryDepart != null">#{destoryDepart},</if>
<if test="destoryUsername != null">#{destoryUsername},</if>
<if test="destoryStyle != null">#{destoryStyle},</if>
<if test="destoryCount != null">#{destoryCount},</if>
<if test="destoryDate != null">#{destoryDate},</if>
<if test="remark != null">#{remark},</if>
</trim> </trim>
</insert> </insert>
@ -109,6 +138,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="extractUserid != null">extract_userid = #{extractUserid},</if> <if test="extractUserid != null">extract_userid = #{extractUserid},</if>
<if test="extractDate != null">extract_date = #{extractDate},</if> <if test="extractDate != null">extract_date = #{extractDate},</if>
<if test="destoryState != null">destory_state = #{destoryState},</if> <if test="destoryState != null">destory_state = #{destoryState},</if>
<if test="destoryAddress != null">destory_address = #{destoryAddress},</if>
<if test="destoryDepart != null">destory_depart = #{destoryDepart},</if>
<if test="destoryUsername != null">destory_username = #{destoryUsername},</if>
<if test="destoryStyle != null">destory_style = #{destoryStyle},</if>
<if test="destoryCount != null">destory_count = #{destoryCount},</if>
<if test="destoryDate != null">destory_date = #{destoryDate},</if>
<if test="remark != null">remark = #{remark},</if>
</trim> </trim>
where receive_id = #{receiveId} where receive_id = #{receiveId}
</update> </update>

Loading…
Cancel
Save