From d9e9b938894192695de7914cf9ed9d58dad350f9 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Wed, 15 May 2024 14:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E6=96=87=E4=BB=B6=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filemanager/TdFileExtractController.java  | 100 ++++++++++++++
 .../filemanager/TdFileReceiveController.java  |  22 +--
 .../templates/system/fileextract/edit.html    |  77 +++++++++++
 .../system/fileextract/fileextract.html       | 126 ++++++++++++++++++
 .../templates/system/fileprovide/add.html     |  60 +++++----
 .../templates/system/fileprovide/detail.html  |  71 +++++-----
 .../templates/system/filereceive/edit.html    |   2 +-
 .../system/filereceive/filereceive.html       |   5 +-
 .../system/mapper/TdFileReceiveMapper.java    |   2 +
 .../system/service/ITdFileReceiveService.java |   7 +
 .../impl/TdFileReceiveServiceImpl.java        |   5 +
 .../mapper/system/TdFileReceiveMapper.xml     |   5 +
 12 files changed, 407 insertions(+), 75 deletions(-)
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/fileextract/edit.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/fileextract/fileextract.html

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
new file mode 100644
index 0000000..728f537
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java
@@ -0,0 +1,100 @@
+package com.ruoyi.web.controller.system.filemanager;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+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.TdFileReceive;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ITdFileReceiveService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 涉密文件提取Controller
+ */
+@Controller
+@RequestMapping("/system/fileextract")
+public class TdFileExtractController extends BaseController {
+    private String prefix = "system/fileextract";
+    @Autowired
+    private ITdFileReceiveService tdFileReceiveService;
+    @Autowired
+    private ISysDeptService deptService;
+
+    
+    @RequiresPermissions("system:fileextract:view")
+    @GetMapping()
+    public String fileextract(ModelMap mmap)
+    {
+        mmap.put("sysuser",getSysUser());
+        return prefix + "/fileextract";
+    }
+
+    /**
+     * 查询涉密文件接收列表
+     */
+    @RequiresPermissions("system:fileextract:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdFileReceive tdFileReceive)
+    {
+        startPage();
+        List<TdFileReceive> tdFileReceives = tdFileReceiveService.selectTdFileReceiveByReceiveDepart(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName());
+        List<TdFileReceive> tdFileReceiveList = new ArrayList<>();
+        for (TdFileReceive tdFileReceivelist : tdFileReceives){
+            if (tdFileReceivelist.getReceiveState().equals("1")){
+                tdFileReceiveList.add(tdFileReceivelist);
+            }
+        }
+        return getDataTable(tdFileReceiveList);
+    }
+
+    /**
+     * 导出涉密文件接收列表
+     */
+    @RequiresPermissions("system:fileextract:export")
+    @Log(title = "涉密文件接收", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TdFileReceive tdFileReceive)
+    {
+        List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
+        ExcelUtil<TdFileReceive> util = new ExcelUtil<TdFileReceive>(TdFileReceive.class);
+        return util.exportExcel(list, "涉密文件接收数据");
+    }
+
+    /**
+     * 涉密文件提取
+     */
+    @RequiresPermissions("system:fileextract:edit")
+    @GetMapping("/edit/{receiveId}")
+    public String edit(@PathVariable("receiveId") Long receiveId, ModelMap mmap)
+    {
+        TdFileReceive tdFileReceive = tdFileReceiveService.selectTdFileReceiveByReceiveId(receiveId);
+        mmap.put("tdFileReceive", tdFileReceive);
+        mmap.put("user",getSysUser());
+        return prefix + "/edit";
+    }
+
+    /**
+     * 保存涉密文件提取
+     */
+    @RequiresPermissions("system:fileextract:edit")
+    @Log(title = "涉密文件接收", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdFileReceive tdFileReceive)
+    {
+        return toAjax(tdFileReceiveService.updateTdFileReceive(tdFileReceive));
+    }
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java
index 80400a5..f9bfd1b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java
@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.system.filemanager;
 
 import java.util.List;
 
-import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.system.service.ISysDeptService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 涉密文件接收Controller
- *
+ * 
  * @author ruoyi
  * @date 2024-05-14
  */
@@ -36,11 +35,14 @@ public class TdFileReceiveController extends BaseController
 
     @Autowired
     private ITdFileReceiveService tdFileReceiveService;
+    @Autowired
+    private ISysDeptService deptService;
 
     @RequiresPermissions("system:filereceive:view")
     @GetMapping()
-    public String filereceive()
+    public String filereceive(ModelMap mmap)
     {
+        mmap.put("sysuser",getSysUser());
         return prefix + "/filereceive";
     }
 
@@ -53,8 +55,8 @@ public class TdFileReceiveController extends BaseController
     public TableDataInfo list(TdFileReceive tdFileReceive)
     {
         startPage();
-        List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
-        return getDataTable(list);
+        List<TdFileReceive> tdFileReceives = tdFileReceiveService.selectTdFileReceiveByReceiveDepart(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName());
+        return getDataTable(tdFileReceives);
     }
 
     /**
@@ -64,9 +66,9 @@ public class TdFileReceiveController extends BaseController
     @Log(title = "涉密文件接收", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(TdFileReceive tdFileReceive)
+    public AjaxResult export()
     {
-        List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive);
+        List<TdFileReceive> list = tdFileReceiveService.selectTdFileReceiveByReceiveDepart(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName());
         ExcelUtil<TdFileReceive> util = new ExcelUtil<TdFileReceive>(TdFileReceive.class);
         return util.exportExcel(list, "涉密文件接收数据");
     }
@@ -93,7 +95,7 @@ public class TdFileReceiveController extends BaseController
     }
 
     /**
-     * 修改涉密文件接收
+     * 涉密文件接收
      */
     @RequiresPermissions("system:filereceive:edit")
     @GetMapping("/edit/{receiveId}")
@@ -106,7 +108,7 @@ public class TdFileReceiveController extends BaseController
     }
 
     /**
-     * 修改保存涉密文件接收
+     * 保存涉密文件接收
      */
     @RequiresPermissions("system:filereceive:edit")
     @Log(title = "涉密文件接收", businessType = BusinessType.UPDATE)
@@ -128,4 +130,6 @@ public class TdFileReceiveController extends BaseController
     {
         return toAjax(tdFileReceiveService.deleteTdFileReceiveByReceiveIds(ids));
     }
+
+
 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileextract/edit.html b/ruoyi-admin/src/main/resources/templates/system/fileextract/edit.html
new file mode 100644
index 0000000..588121a
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/fileextract/edit.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <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-filereceive-edit" th:object="${tdFileReceive}">
+        <input name="receiveId" th:field="*{receiveId}" type="hidden">
+        <input name="receiveState" th:value="'1'" class="form-control" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">文件编号：</label>
+            <div class="col-sm-8">
+                <input name="fileId" readonly th:field="*{fileId}" 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" readonly th:field="*{fileName}" 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="provideDepart" readonly th:field="*{provideDepart}" 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="provideDate" readonly th:value="${#dates.format(tdFileReceive.provideDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">接收单位：</label>
+            <div class="col-sm-8">
+                <input name="receiveDepartid" readonly th:field="*{receiveDepartid}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">提取人员：</label>
+            <div class="col-sm-8">
+                <input name="extractUserid" th:value="${user.userName}" readonly 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="extractDate" readonly class="form-control" placeholder="yyyy-MM-dd" type="text">
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "system/fileextract";
+    $("#form-filereceive-edit").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/edit", $('#form-fileextract-edit').serialize());
+        }
+    }
+    $("input[name='extractDate']").val($.common.dateFormat(new Date(),"yyyy-MM-dd"));
+    $("input[name='extractDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileextract/fileextract.html b/ruoyi-admin/src/main/resources/templates/system/fileextract/fileextract.html
new file mode 100644
index 0000000..3065b49
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/fileextract/fileextract.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('涉密文件提取列表')" />
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>文件编号：</label>
+                            <input type="text" name="fileId"/>
+                        </li>
+                        <li>
+                            <label>文件名称：</label>
+                            <input type="text" name="fileName"/>
+                        </li>
+                        <li>
+                            <label>发文单位：</label>
+                            <input type="text" name="provideDepart"/>
+                        </li>
+                        <li>
+                            <label>提取状态：</label>
+                            <select name="extractState" th:with="type=${@dict.getType('sys_file_extract')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <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:fileextract: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>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:fileextract:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:fileextract: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/fileextract";
+
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "涉密文件提取",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'receiveId',
+                    title: '接收编号',
+                    visible: false
+                },
+                {
+                    field: 'fileId',
+                    title: '文件编号'
+                },
+                {
+                    field: 'fileName',
+                    title: '文件名称'
+                },
+                {
+                    field: 'provideDepart',
+                    title: '发文单位'
+                },
+                {
+                    field: 'provideDate',
+                    title: '发文日期'
+                },
+                {
+                    field: 'receiveDepartid',
+                    title: '接收单位'
+                },
+                {
+                    field: 'extractState',
+                    title: '提取状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(extractStateDatas, value);
+                    }
+                },
+                {
+                    field: 'extractUserid',
+                    title: '提取人员'
+                },
+                {
+                    field: 'extractDate',
+                    title: '提取日期'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        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.receiveId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
index e392283..b65cd32 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
@@ -4,20 +4,21 @@
     <th:block th:include="include :: header('新增文件下发')" />
     <th:block th:include="include :: select2-css" />
     <th:block th:include="include :: bootstrap-select-css" />
+    <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-fileprovide-add">
             <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 disabled name="fileId" class="form-control" type="text">
+                    <input name="frameworkId" class="form-control" type="text">
                 </div>
             </div>
             <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="provideCount" class="form-control" type="text">
+                    <input name="areaid" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
@@ -35,9 +36,19 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">发文日期：</label>
                 <div class="col-sm-8">
-                    <input name="provideDate" class="form-control" type="text">
+                    <div class="input-group date">
+                        <input name="provideDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">发文份数：</label>
+                <div class="col-sm-8">
+                    <input name="provideCount" class="form-control" type="text">
+                </div>
+            </div>
+
             <div class="form-group">
                 <label class="col-sm-3 control-label">收文单位：</label>
                 <div class="col-sm-8">
@@ -55,21 +66,15 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">定密依据：</label>
-                <div class="col-sm-8">
-                    <input name="allianceFile" class="form-control" type="text">
-                </div>
-            </div>
-            <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="remark" class="form-control" type="text">
+                    <input name="fileName" class="form-control" type="text">
                 </div>
             </div>
             <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="frameworkId" class="form-control" type="text">
+                    <input name="fileNum" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
@@ -81,34 +86,30 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">保密期限：</label>
-                <div class="col-sm-8">
-                    <input name="releaseSecretid" class="form-control" type="text">
-                </div>
-            </div>
-            <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="fileName" class="form-control" type="text">
+                    <input name="allianceFile" class="form-control" type="text">
                 </div>
             </div>
             <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="fileNum" class="form-control" type="text">
+                    <input name="releaseSecretid" class="form-control" type="text">
                 </div>
             </div>
             <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="areaid" class="form-control" type="text">
+                    <input name="remark" class="form-control" type="text">
                 </div>
             </div>
+
         </form>
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: select2-js" />
     <th:block th:include="include :: bootstrap-select-js" />
+    <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
         var prefix = ctx + "system/fileprovide"
         $("#form-fileprovide-add").validate({
@@ -120,6 +121,11 @@
                 $.operate.save(prefix + "/add", $('#form-fileprovide-add').serialize());
             }
         }
+        $("input[name='provideDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
     </script>
 </body>
 </html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html
index 41dc90b..d8d94d3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html
@@ -21,9 +21,15 @@
             </div>
         </div>
         <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="provideCount" readonly th:field="*{provideCount}" class="form-control" type="text">
+                <input name="frameworkId" readonly th:field="*{frameworkId}" 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="areaid" readonly th:field="*{areaid}" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
@@ -38,10 +44,20 @@
                 <input name="provideUserid" readonly th:field="*{provideUserid}" 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="provideDate" readonly id="provideDate" th:field="*{provideDate}" class="form-control" type="text">
+                <div class="input-group date">
+                    <input name="provideDate" readonly th:value="${#dates.format(tdFileProvide.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="provideCount" readonly th:field="*{provideCount}" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
@@ -61,33 +77,15 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">定密依据：</label>
-            <div class="col-sm-8">
-                <input name="allianceFile" readonly th:field="*{allianceFile}" 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="remark" readonly th:field="*{remark}" 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="updateUser" id="updateDate" readonly th:field="*{updateUser}" class="form-control" type="text">
-            </div>
-        </div>
-        <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="updateDate" readonly th:field="*{updateDate}" class="form-control" type="text">
+                <input name="fileName" readonly th:field="*{fileName}" class="form-control" type="text">
             </div>
         </div>
         <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="frameworkId" readonly th:field="*{frameworkId}" class="form-control" type="text">
+                <input name="fileNum" readonly th:field="*{fileNum}" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
@@ -99,27 +97,21 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">保密期限：</label>
-            <div class="col-sm-8">
-                <input name="releaseSecretid" readonly th:field="*{releaseSecretid}" class="form-control" type="text">
-            </div>
-        </div>
-        <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="fileName" readonly th:field="*{fileName}" class="form-control" type="text">
+                <input name="allianceFile" readonly th:field="*{allianceFile}" class="form-control" type="text">
             </div>
         </div>
         <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="fileNum" readonly th:field="*{fileNum}" class="form-control" type="text">
+                <input name="releaseSecretid" readonly th:field="*{releaseSecretid}" class="form-control" type="text">
             </div>
         </div>
         <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="areaid" readonly th:field="*{areaid}" class="form-control" type="text">
+                <input name="remark" readonly th:field="*{remark}" class="form-control" type="text">
             </div>
         </div>
     </form>
@@ -145,6 +137,11 @@
             $.operate.save(prefix + "/edit", $('#form-fileprovide-edit').serialize());
         }
     }
+    $("input[name='provideDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
 </script>
 </body>
 </html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html b/ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html
index e2aa39c..36c50b9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/filereceive/edit.html
@@ -1,7 +1,7 @@
 <!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">
diff --git a/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html b/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html
index e9af521..1904074 100644
--- a/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html
+++ b/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html
@@ -24,7 +24,10 @@
                         </li>
                         <li>
                             <label>接收状态：</label>
-                            <input type="text" name="receiveState"/>
+                            <select name="receiveState" th:with="type=${@dict.getType('sys_file_receive')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdFileReceiveMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdFileReceiveMapper.java
index 39aa788..18b65a3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdFileReceiveMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdFileReceiveMapper.java
@@ -19,6 +19,8 @@ public interface TdFileReceiveMapper
      */
     public TdFileReceive selectTdFileReceiveByReceiveId(Long receiveId);
 
+    public List<TdFileReceive> selectTdFileReceiveByReceiveDepart(String receiveDepart);
+
     /**
      * 查询涉密文件接收列表
      * 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdFileReceiveService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdFileReceiveService.java
index 0a742d5..27b7a1e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdFileReceiveService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdFileReceiveService.java
@@ -19,6 +19,13 @@ public interface ITdFileReceiveService
      */
     public TdFileReceive selectTdFileReceiveByReceiveId(Long receiveId);
 
+    /**
+     * 根据部门查询接收列表
+     * @param receiveDepart
+     * @return
+     */
+    public List<TdFileReceive> selectTdFileReceiveByReceiveDepart(String receiveDepart);
+
     /**
      * 查询涉密文件接收列表
      * 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdFileReceiveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdFileReceiveServiceImpl.java
index 0508044..a981f02 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdFileReceiveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdFileReceiveServiceImpl.java
@@ -32,6 +32,11 @@ public class TdFileReceiveServiceImpl implements ITdFileReceiveService
         return tdFileReceiveMapper.selectTdFileReceiveByReceiveId(receiveId);
     }
 
+    @Override
+    public List<TdFileReceive> selectTdFileReceiveByReceiveDepart(String receiveDepart) {
+        return tdFileReceiveMapper.selectTdFileReceiveByReceiveDepart(receiveDepart);
+    }
+
     /**
      * 查询涉密文件接收列表
      * 
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml
index 65297fe..e44e113 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml
@@ -48,6 +48,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTdFileReceiveVo"/>
         where receive_id = #{receiveId}
     </select>
+
+    <select id="selectTdFileReceiveByReceiveDepart" parameterType="String" resultMap="TdFileReceiveResult">
+        <include refid="selectTdFileReceiveVo"/>
+        where receive_departid = #{receiveDepartid}
+    </select>
         
     <insert id="insertTdFileReceive" parameterType="TdFileReceive" useGeneratedKeys="true" keyProperty="receiveId">
         insert into td_file_receive