From 438458756ca41c19e20c158b7debd424ab09a314 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Wed, 8 May 2024 09:52:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=EF=BC=8C=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=EF=BC=8C=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/TdCheckController.java  |  15 +-
 .../src/main/resources/templates/main.html    |  14 +-
 .../templates/system/check/check.html         |   3 +-
 .../templates/system/check/selfcheck.html     | 131 +++++++++++++++++-
 .../system/checkresult/checkresult.html       |   3 -
 5 files changed, 150 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckController.java
index 5af67ce..6521884 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckController.java
@@ -72,8 +72,9 @@ public class TdCheckController extends BaseController
      * 新增检查报告管理
      */
     @GetMapping("/add")
-    public String add()
+    public String add(ModelMap mmap)
     {
+        mmap.put("user", getSysUser());
         return prefix + "/add";
     }
 
@@ -149,6 +150,18 @@ public class TdCheckController extends BaseController
         return toAjax(tdCheckService.updateTdCheck(tdCheck));
     }
 
+    /**
+     * 详情操作 报告管理
+     */
+    @RequiresPermissions("system:check:detail")
+    @GetMapping("/detail/{checkId}")
+    public String detail(@PathVariable("checkId") Long checkId, ModelMap mmap)
+    {
+        TdCheck tdCheck = tdCheckService.selectTdCheckByCheckId(checkId);
+        mmap.put("tdCheck", tdCheck);
+        return prefix + "/detail";
+    }
+
     /**
      * 打印操作
      */
diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html
index 120f447..8161cd0 100644
--- a/ruoyi-admin/src/main/resources/templates/main.html
+++ b/ruoyi-admin/src/main/resources/templates/main.html
@@ -64,13 +64,13 @@
             <p><span>第八条</span>&nbsp;&nbsp;&nbsp;国家对在保守、保护国家秘密以及改进保密技术、措施等方面成绩显著的单位或者个人给予奖励。</p>
             <p><span>第九条</span>&nbsp;&nbsp;&nbsp;下列涉及国家安全和利益的事项，泄露后可能损害国家在政治、经济、国防、外交等领域的安全和利益的，应当确定为国家秘密：
 				<ul>
-					<li>(一)国家事务重大决策中的秘密事项；</li>
-					<li>(二)国防建设和武装力量活动中的秘密事项；</li>
-					<li>(三)外交和外事活动中的秘密事项以及对外承担保密义务的秘密事项；</li>
-					<li>(四)国民经济和社会发展中的秘密事项；</li>
-					<li>(五)科学技术中的秘密事项；</li>
-					<li>(六)维护国家安全活动和追查刑事犯罪中的秘密事项；</li>
-					<li>(七)经国家保密行政管理部门确定的其他秘密事项。</li>
+					<li>（一）国家事务重大决策中的秘密事项；</li>
+					<li>（二）国防建设和武装力量活动中的秘密事项；</li>
+					<li>（三）外交和外事活动中的秘密事项以及对外承担保密义务的秘密事项；</li>
+					<li>（四）国民经济和社会发展中的秘密事项；</li>
+					<li>（五）科学技术中的秘密事项；</li>
+					<li>（六）维护国家安全活动和追查刑事犯罪中的秘密事项；</li>
+					<li>（七）经国家保密行政管理部门确定的其他秘密事项。</li>
 				</ul>
 				<p>政党的秘密事项中符合前款规定的，属于国家秘密。</p>
             </p>
diff --git a/ruoyi-admin/src/main/resources/templates/system/check/check.html b/ruoyi-admin/src/main/resources/templates/system/check/check.html
index 09aebf4..659fa8d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/check/check.html
+++ b/ruoyi-admin/src/main/resources/templates/system/check/check.html
@@ -60,6 +60,7 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:check:edit')}]];
+        var selfCheckFlag = [[${@permission.hasPermi('system:check:selfcheck')}]];
         var removeFlag = [[${@permission.hasPermi('system:check:remove')}]];
         var checkTypeDatas = [[${@dict.getType('sys_check_type')}]];
         var checkStateDatas = [[${@dict.getType('sys_check_state')}]];
@@ -121,7 +122,7 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkId + '\')"><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.checkId + '\')"><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.checkId + '\')"><i class="fa fa-edit"></i>检查</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + selfCheckFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkId + '\')"><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.checkId + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html b/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html
index 566549b..543caf2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html
+++ b/ruoyi-admin/src/main/resources/templates/system/check/selfcheck.html
@@ -1,10 +1,133 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <meta charset="UTF-8">
-    <title>Title</title>
+    <th:block th:include="include :: header('自行检查')" />
+    <th:block th:include="include :: datetimepicker-css" />
 </head>
-<body>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-check-edit" th:object="${tdCheck}">
+        <input name="checkId" th:field="*{checkId}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">报告人：</label>
+            <div class="col-sm-8">
+                <input name="user" disabled th:field="*{user}" 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="depart" disabled th:field="*{depart}" 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="checkStartTime" disabled th:value="${#dates.format(tdCheck.checkStartTime, '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="framework" disabled th:field="*{framework}" 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="area" disabled th:field="*{area}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">人员检查：</label>
+            <div class="col-sm-8">
+                <textarea name="checkcontentry" disabled th:field="*{checkcontentry}" class="form-control" ></textarea>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">人员状态：</label>
+            <div class="col-sm-8">
+                <div class="radio-box" th:each="dict : ${@dict.getType('sys_examine_state')}">
+                    <input type="radio" th:id="${'checkcontentryjt_' + dict.dictCode}" name="checkcontentryjt" th:value="${dict.dictValue}" th:field="*{checkcontentryjt}">
+                    <label th:for="${'checkcontentryjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">文件检查：</label>
+            <div class="col-sm-8">
+                <textarea name="checkcontentrywj" disabled th:field="*{checkcontentrywj}" class="form-control" ></textarea>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">文件状态：</label>
+            <div class="col-sm-8">
+                <div class="radio-box" th:each="dict : ${@dict.getType('sys_examine_state')}">
+                    <input type="radio" th:id="${'checkcontentrywjjt_' + dict.dictCode}" name="checkcontentrywjjt" th:value="${dict.dictValue}" th:field="*{checkcontentrywjjt}">
+                    <label th:for="${'checkcontentrywjjt_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">资产检查：</label>
+            <div class="col-sm-8">
+                <textarea name="checkcontentrysb" disabled th:field="*{checkcontentrysb}" class="form-control" ></textarea>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">管理制度检查：</label>
+            <div class="col-sm-8">
+                <textarea name="checkcontentryglzd" disabled th:field="*{checkcontentryglzd}" class="form-control" ></textarea>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">泄密事件检查：</label>
+            <div class="col-sm-8">
+                <textarea name="checkcontentryxmsj" disabled h:field="*{checkcontentryxmsj}" class="form-control" ></textarea>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">其他项目检查：</label>
+            <div class="col-sm-8">
+                <textarea name="checkcontentryother" disabled th:field="*{checkcontentryother}" class="form-control" ></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/check";
+    $("#form-check-edit").validate({
+        focusCleanup: true
+    });
 
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/edit", $('#form-check-edit').serialize());
+        }
+    }
+
+    $("input[name='checkStartTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='checkEndTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='checkownresulttime']").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/checkresult/checkresult.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html
index 09aebf4..307cb49 100644
--- a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html
+++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html
@@ -39,9 +39,6 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:check:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:check:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>