From 63780c7f9ee66a41728f0b6b58a7049027c6df9d Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Thu, 16 May 2024 16:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E6=96=87=E4=BB=B6=E9=94=80?=
 =?UTF-8?q?=E6=AF=81=EF=BC=8C=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/count/SysFilenumController.java    |   2 +
 .../system/count/SysNetworknumController.java |   2 +
 .../count/SysPropertynumController.java       |   2 +
 .../filemanager/TdFileDestoryController.java  |  68 +++----
 .../filemanager/TdFileExtractController.java  |  11 -
 .../templates/system/filedestory/edit.html    | 190 +++++++++++-------
 .../system/filedestory/filedestory.html       | 163 ++++++++-------
 .../ruoyi/system/domain/TdFileDestory.java    | 153 --------------
 .../ruoyi/system/domain/TdFileReceive.java    | 183 +++++++++++++----
 .../system/mapper/TdFileDestoryMapper.java    |  61 ------
 .../system/service/ITdFileDestoryService.java |  61 ------
 .../impl/TdFileDestoryServiceImpl.java        |  94 ---------
 .../mapper/system/TdFileDestoryMapper.xml     |  97 ---------
 .../mapper/system/TdFileReceiveMapper.xml     |  38 +++-
 14 files changed, 420 insertions(+), 705 deletions(-)
 delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileDestory.java
 delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdFileDestoryMapper.java
 delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ITdFileDestoryService.java
 delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdFileDestoryServiceImpl.java
 delete mode 100644 ruoyi-system/src/main/resources/mapper/system/TdFileDestoryMapper.xml

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysFilenumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysFilenumController.java
index dc92281..1e2097a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysFilenumController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysFilenumController.java
@@ -57,7 +57,9 @@ public class SysFilenumController extends BaseController {
     public String print(@PathVariable("fileId") String fileId, ModelMap mmap)
     {
         List<TdFileReceive> tdFileReceives = tdFileReceiveService.selectTdFileReceiveByFileId(fileId);
+        TdFileProvide tdFileProvide = tdFileProvideService.selectTdFileProvideByFileId(fileId);
         mmap.put("tdFileReceives", tdFileReceives);
+        mmap.put("tdFileProvide", tdFileProvide);
         return prefix + "/print";
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java
index bc5d9b0..adc9ebb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java
@@ -53,7 +53,9 @@ public class SysNetworknumController extends BaseController {
     public String print(@PathVariable("netId") String netId, ModelMap mmap)
     {
         List<TdPropertyNetinfo> tdPropertyNetinfos = tdPropertyNetinfoService.selectTdPropertyNetinfoByNetId(netId);
+        TdPropertyNet tdPropertyNet = tdPropertyNetService.selectTdPropertyNetByNetId(netId);
         mmap.put("tdPropertyNetinfos", tdPropertyNetinfos);
+        mmap.put("tdPropertyNet", tdPropertyNet);
         return prefix + "/print";
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java
index f2eb311..f52e416 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java
@@ -51,7 +51,9 @@ public class SysPropertynumController extends BaseController {
     public String print(@PathVariable("useId") String useId, ModelMap mmap)
     {
         List<TdPropertyInfo> tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoByUseId(useId);
+        TdPropertyManager tdPropertyManager = tdPropertyManagerService.selectTdPropertyManagerByUseId(useId);
         mmap.put("tdPropertyInfos", tdPropertyInfos);
+        mmap.put("tdPropertyManager", tdPropertyManager);
         return prefix + "/print";
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileDestoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileDestoryController.java
index 1258a1b..becf41e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileDestoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileDestoryController.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.ruoyi.system.domain.TdFileProvide;
 import com.ruoyi.system.domain.TdFileReceive;
+import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ITdFileProvideService;
 import com.ruoyi.system.service.ITdFileReceiveService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -14,8 +15,6 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 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.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -33,12 +32,12 @@ public class TdFileDestoryController extends BaseController
 {
     private String prefix = "system/filedestory";
 
-    @Autowired
-    private ITdFileDestoryService tdFileDestoryService;
     @Autowired
     private ITdFileReceiveService tdFileReceiveService;
     @Autowired
     private ITdFileProvideService tdFileProvideService;
+    @Autowired
+    private ISysDeptService deptService;
 
     @RequiresPermissions("system:filedestory:view")
     @GetMapping()
@@ -53,19 +52,18 @@ public class TdFileDestoryController extends BaseController
     @RequiresPermissions("system:filedestory:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(TdFileDestory tdFileDestory,ModelMap mmap)
+    public TableDataInfo list(TdFileReceive tdFileReceive)
     {
         startPage();
-        List<TdFileDestory> list = tdFileDestoryService.selectTdFileDestoryList(tdFileDestory);
-        List<TdFileReceive> tdFileReceiveList = new ArrayList<>();
-        List<List> list1 = new ArrayList<>();
-        for (TdFileDestory tdFileDestorylist : list){
-            TdFileReceive tdFileReceive = tdFileReceiveService.selectTdFileReceiveByReceiveId(tdFileDestorylist.getReceiveId());
-            tdFileReceiveList.add(tdFileReceive);
+        List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
+        List<TdFileReceive> tdFileReceives = new ArrayList<>();
+        for (TdFileReceive FileReceivelist : list){
+            if (FileReceivelist.getExtractState().equals("1") && FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){
+                tdFileReceives.add(FileReceivelist);
+            }
         }
-        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)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(TdFileDestory tdFileDestory)
+    public AjaxResult export(TdFileReceive tdFileReceive)
     {
-        List<TdFileDestory> list = tdFileDestoryService.selectTdFileDestoryList(tdFileDestory);
-        ExcelUtil<TdFileDestory> util = new ExcelUtil<TdFileDestory>(TdFileDestory.class);
+        List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
+        ExcelUtil<TdFileReceive> util = new ExcelUtil<TdFileReceive>(TdFileReceive.class);
         return util.exportExcel(list, "涉密文件销毁数据");
     }
 
@@ -86,14 +84,14 @@ public class TdFileDestoryController extends BaseController
      * 修改涉密文件销毁
      */
     @RequiresPermissions("system:filedestory:edit")
-    @GetMapping("/edit/{destoryId}")
-    public String edit(@PathVariable("destoryId") Long destoryId, ModelMap mmap)
+    @GetMapping("/edit/{receiveId}")
+    public String edit(@PathVariable("receiveId") Long receiveId, ModelMap mmap)
     {
-        TdFileDestory tdFileDestory = tdFileDestoryService.selectTdFileDestoryByDestoryId(destoryId);
-        String fileId = (tdFileReceiveService.selectTdFileReceiveByReceiveId(tdFileDestory.getReceiveId())).getFileId();
+        TdFileReceive tdFileReceive = tdFileReceiveService.selectTdFileReceiveByReceiveId(receiveId);
+        String fileId = tdFileReceive.getFileId();
         TdFileProvide tdFileProvide = tdFileProvideService.selectTdFileProvideByFileId(fileId);
         mmap.put("tdFileProvide", tdFileProvide);
-        mmap.put("tdFileDestory", tdFileDestory);
+        mmap.put("tdFileReceive", tdFileReceive);
         return prefix + "/edit";
     }
 
@@ -104,35 +102,23 @@ public class TdFileDestoryController extends BaseController
     @Log(title = "涉密文件销毁", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(TdFileDestory tdFileDestory)
-    {
-        return toAjax(tdFileDestoryService.updateTdFileDestory(tdFileDestory));
-    }
-
-    /**
-     * 删除涉密文件销毁
-     */
-    @RequiresPermissions("system:filedestory:remove")
-    @Log(title = "涉密文件销毁", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
+    public AjaxResult editSave(TdFileReceive tdFileReceive)
     {
-        return toAjax(tdFileDestoryService.deleteTdFileDestoryByDestoryIds(ids));
+        return toAjax(tdFileReceiveService.updateTdFileReceive(tdFileReceive));
     }
 
     /**
      * 涉密文件销毁详情
      */
     @RequiresPermissions("system:filedestory:detail")
-    @GetMapping("/detail/{destoryId}")
-    public String detail(@PathVariable("destoryId") Long destoryId, ModelMap mmap)
+    @GetMapping("/detail/{receiveId}")
+    public String detail(@PathVariable("receiveId") Long receiveId, ModelMap mmap)
     {
-        TdFileDestory tdFileDestory = tdFileDestoryService.selectTdFileDestoryByDestoryId(destoryId);
-        String fileId = (tdFileReceiveService.selectTdFileReceiveByReceiveId(tdFileDestory.getReceiveId())).getFileId();
+        TdFileReceive tdFileReceive = tdFileReceiveService.selectTdFileReceiveByReceiveId(receiveId);
+        String fileId = tdFileReceive.getFileId();
         TdFileProvide tdFileProvide = tdFileProvideService.selectTdFileProvideByFileId(fileId);
         mmap.put("tdFileProvide", tdFileProvide);
-        mmap.put("tdFileDestory", tdFileDestory);
+        mmap.put("tdFileReceive", tdFileReceive);
         return prefix + "/detail";
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java
index 008aecf..4d96d57 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java
@@ -6,10 +6,8 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.TdFileDestory;
 import com.ruoyi.system.domain.TdFileReceive;
 import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ITdFileDestoryService;
 import com.ruoyi.system.service.ITdFileReceiveService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,10 +29,7 @@ public class TdFileExtractController extends BaseController {
     private ITdFileReceiveService tdFileReceiveService;
     @Autowired
     private ISysDeptService deptService;
-    @Autowired
-    private ITdFileDestoryService tdFileDestoryService;
 
-    
     @RequiresPermissions("system:fileextract:view")
     @GetMapping()
     public String fileextract(ModelMap mmap)
@@ -98,12 +93,6 @@ public class TdFileExtractController extends BaseController {
     @ResponseBody
     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));
     }
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html b/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html
index a0aa828..24d5674 100644
--- a/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html
@@ -1,91 +1,145 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <th:block th:include="include :: header('修改涉密文件销毁')" />
+    <th:block th:include="include :: header('修改涉密文件接收')" />
     <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-filedestory-edit" th:object="${tdFileDestory}">
-            <input name="destoryId" th:field="*{destoryId}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">接收id：</label>
-                <div class="col-sm-8">
-                    <input name="receiveId" th:field="*{receiveId}" 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" disabled 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="destoryFilename" th:field="*{destoryFilename}" 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" disabled 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">
-                    <textarea name="destoryAddress" class="form-control">[[*{destoryAddress}]]</textarea>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">发文单位：</label>
+            <div class="col-sm-8">
+                <input name="provideDepart" disabled 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="destoryCount" th:field="*{destoryCount}" 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" 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 class="form-group">    
-                <label class="col-sm-3 control-label">销毁单位：</label>
-                <div class="col-sm-8">
-                    <input name="destoryDepart" th:field="*{destoryDepart}" 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" disabled th:field="*{extractDepartid}" 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="destoryUsername" th:field="*{destoryUsername}" 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="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 class="form-group">    
-                <label class="col-sm-3 control-label">销毁方式：</label>
-                <div class="col-sm-8">
-                    <input name="destoryStyle" th:field="*{destoryStyle}" 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="destoryState" th:field="*{destoryState}" 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="destoryDate" th:value="${#dates.format(tdFileDestory.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>
-                    </div>
-                </div>
+        </div>
+        <div class="form-group">
+            <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">
+                <input name="destoryDepart" th:field="*{destoryDepart}" class="form-control" type="text">
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">销毁人员：</label>
+            <div class="col-sm-8">
+                <input name="destoryUsername" th:field="*{destoryUsername}" 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="destoryStyle" th:field="*{destoryStyle}" 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="destoryCount" th:field="*{destoryCount}" 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="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>
                 </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/filedestory";
-        $("#form-filedestory-edit").validate({
-            focusCleanup: true
-        });
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备注：</label>
+            <div class="col-sm-8">
+                <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
+            </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-filedestory-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='extractDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
 
-        $("input[name='destoryDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
+    $("input[name='destoryDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/filedestory/filedestory.html b/ruoyi-admin/src/main/resources/templates/system/filedestory/filedestory.html
index 8f4a01a..6516f48 100644
--- a/ruoyi-admin/src/main/resources/templates/system/filedestory/filedestory.html
+++ b/ruoyi-admin/src/main/resources/templates/system/filedestory/filedestory.html
@@ -1,99 +1,111 @@
 <!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('涉密文件销毁列表')" />
+    <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="destoryFilename"/>
-                            </li>
-                            <li>
-                                <label>销毁单位：</label>
-                                <input type="text" name="destoryDepart"/>
-                            </li>
-                            <li>
-                                <label>销毁方式：</label>
-                                <input type="text" name="destoryStyle"/>
-                            </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>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:filedestory:remove">
-                    <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> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+                        <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="destoryState"/>
+                        </li>
+                        <li>
+                            <label>销毁方式：</label>
+                            <input type="text" name="destoryStyle"/>
+                        </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-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:filedestory:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:filedestory:remove')}]];
-        var prefix = ctx + "system/filedestory";
+</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: 'destoryId',
-                    title: 'id',
+                    field: 'receiveId',
+                    title: '接收编号',
                     visible: false
                 },
                 {
-                    field: 'receiveId',
-                    title: '接收id'
+                    field: 'fileName',
+                    title: '文件名称'
+                },
+                {
+                    field: 'provideDepart',
+                    title: '发文单位'
                 },
                 {
-                    field: 'destoryFilename',
-                    title: '文件名'
+                    field: 'extractDepartid',
+                    title: '提取单位'
                 },
                 {
-                    field: 'destoryAddress',
-                    title: '销毁地点'
+                    field: 'extractUserid',
+                    title: '提取人员'
                 },
                 {
-                    field: 'destoryCount',
-                    title: '销毁数量'
+                    field: 'extractDate',
+                    title: '提取日期'
+                },
+                {
+                    field: 'destoryState',
+                    title: '销毁状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(destoryStateDatas, value);
+                    }
                 },
                 {
                     field: 'destoryDepart',
-                    title: '销毁单位'
+                    title: '销毁部门'
                 },
                 {
                     field: 'destoryUsername',
                     title: '销毁人员'
                 },
-                {
-                    field: 'destoryStyle',
-                    title: '销毁方式'
-                },
                 {
                     field: 'destoryDate',
                     title: '销毁日期'
@@ -107,15 +119,14 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         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-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.destoryId + '\')"><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.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.receiveId + '\')"><i class="fa fa-edit"></i>销毁</a> ');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
-    </script>
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileDestory.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileDestory.java
deleted file mode 100644
index e3f8f9a..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileDestory.java
+++ /dev/null
@@ -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();
-    }
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java
index eba8c7b..ce9999f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdFileReceive.java
@@ -9,9 +9,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 涉密文件接收对象 td_file_receive
- * 
+ *
  * @author ruoyi
- * @date 2024-05-14
+ * @date 2024-05-16
  */
 public class TdFileReceive extends BaseEntity
 {
@@ -75,25 +75,63 @@ public class TdFileReceive extends BaseEntity
     @Excel(name = "销毁状态")
     private String destoryState;
 
-    public void setReceiveId(Long receiveId) 
+    /** 销毁地点 */
+    @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)
     {
         this.receiveId = receiveId;
     }
 
-    public Long getReceiveId() 
+    public Long getReceiveId()
     {
         return receiveId;
     }
-    public void setFileId(String fileId) 
+    public void setFileId(String fileId)
     {
         this.fileId = fileId;
     }
 
-    public String getFileId() 
+    public String getFileId()
     {
         return fileId;
     }
-
     public void setFileName(String fileName)
     {
         this.fileName = fileName;
@@ -121,105 +159,166 @@ public class TdFileReceive extends BaseEntity
     {
         return provideDate;
     }
-    public void setReceiveDepartid(String receiveDepartid) 
+    public void setReceiveDepartid(String receiveDepartid)
     {
         this.receiveDepartid = receiveDepartid;
     }
 
-    public String getReceiveDepartid() 
+    public String getReceiveDepartid()
     {
         return receiveDepartid;
     }
-    public void setReceiveState(String receiveState) 
+    public void setReceiveState(String receiveState)
     {
         this.receiveState = receiveState;
     }
 
-    public String getReceiveState() 
+    public String getReceiveState()
     {
         return receiveState;
     }
-    public void setReceiveUserid(String receiveUserid) 
+    public void setReceiveUserid(String receiveUserid)
     {
         this.receiveUserid = receiveUserid;
     }
 
-    public String getReceiveUserid() 
+    public String getReceiveUserid()
     {
         return receiveUserid;
     }
-    public void setReceiveDate(Date receiveDate) 
+    public void setReceiveDate(Date receiveDate)
     {
         this.receiveDate = receiveDate;
     }
 
-    public Date getReceiveDate() 
+    public Date getReceiveDate()
     {
         return receiveDate;
     }
-    public void setExtractState(String extractState) 
+    public void setExtractState(String extractState)
     {
         this.extractState = extractState;
     }
 
-    public String getExtractState() 
+    public String getExtractState()
     {
         return extractState;
     }
-    public void setExtractDepartid(String extractDepartid) 
+    public void setExtractDepartid(String extractDepartid)
     {
         this.extractDepartid = extractDepartid;
     }
 
-    public String getExtractDepartid() 
+    public String getExtractDepartid()
     {
         return extractDepartid;
     }
-    public void setExtractUserid(String extractUserid) 
+    public void setExtractUserid(String extractUserid)
     {
         this.extractUserid = extractUserid;
     }
 
-    public String getExtractUserid() 
+    public String getExtractUserid()
     {
         return extractUserid;
     }
-    public void setExtractDate(Date extractDate) 
+    public void setExtractDate(Date extractDate)
     {
         this.extractDate = extractDate;
     }
 
-    public Date getExtractDate() 
+    public Date getExtractDate()
     {
         return extractDate;
     }
-    public void setDestoryState(String destoryState) 
+    public void setDestoryState(String destoryState)
     {
         this.destoryState = destoryState;
     }
 
-    public String getDestoryState() 
+    public String getDestoryState()
     {
         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
     public String toString() {
         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())
-            .append("receiveDate", getReceiveDate())
-            .append("extractState", getExtractState())
-            .append("extractDepartid", getExtractDepartid())
-            .append("extractUserid", getExtractUserid())
-            .append("extractDate", getExtractDate())
-            .append("destoryState", getDestoryState())
-            .toString();
-    }
-}
+                .append("receiveId", getReceiveId())
+                .append("fileId", getFileId())
+                .append("fileName", getFileName())
+                .append("provideDepart", getProvideDepart())
+                .append("provideDate", getProvideDate())
+                .append("receiveDepartid", getReceiveDepartid())
+                .append("receiveState", getReceiveState())
+                .append("receiveUserid", getReceiveUserid())
+                .append("receiveDate", getReceiveDate())
+                .append("extractState", getExtractState())
+                .append("extractDepartid", getExtractDepartid())
+                .append("extractUserid", getExtractUserid())
+                .append("extractDate", getExtractDate())
+                .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();
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdFileDestoryMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdFileDestoryMapper.java
deleted file mode 100644
index f948e9e..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdFileDestoryMapper.java
+++ /dev/null
@@ -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);
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdFileDestoryService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdFileDestoryService.java
deleted file mode 100644
index 393ae59..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdFileDestoryService.java
+++ /dev/null
@@ -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);
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdFileDestoryServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdFileDestoryServiceImpl.java
deleted file mode 100644
index c94473b..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdFileDestoryServiceImpl.java
+++ /dev/null
@@ -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);
-    }
-}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdFileDestoryMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdFileDestoryMapper.xml
deleted file mode 100644
index 620effd..0000000
--- a/ruoyi-system/src/main/resources/mapper/system/TdFileDestoryMapper.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml
index b139a87..56a1854 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml
@@ -19,10 +19,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="extractUserid"    column="extract_userid"    />
         <result property="extractDate"    column="extract_date"    />
         <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>
 
     <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>
 
     <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="extractDate != null "> and extract_date = #{extractDate}</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>
     </select>
     
@@ -75,6 +90,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="extractUserid != null">extract_userid,</if>
             <if test="extractDate != null">extract_date,</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 prefix="values (" suffix=")" suffixOverrides=",">
             <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="extractDate != null">#{extractDate},</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>
     </insert>
 
@@ -109,6 +138,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="extractUserid != null">extract_userid = #{extractUserid},</if>
             <if test="extractDate != null">extract_date = #{extractDate},</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>
         where receive_id = #{receiveId}
     </update>