From 08be98b4470b8e2f0388e48981d258a6571cc002 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Tue, 20 Aug 2024 15:17:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AF=86=E5=93=81=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/manager/CheckReportManager.java  | 2 +-
 .../web/controller/system/check/CheckReportController.java    | 1 +
 .../resources/templates/system/checkReport/checkReport.html   | 2 +-
 .../resources/templates/system/checkresult/checkresult.html   | 2 +-
 .../src/main/resources/mapper/system/TdCheckReportMapper.xml  | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java
index 3fe315a..f94c8e5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java
@@ -58,7 +58,7 @@ public class CheckReportManager {
                     .remove();
         } else {
             if(Objects.isNull(tdCheckReport.getCheckState())){
-                tdCheckReport.setCheckState("2");
+                tdCheckReport.setCheckState("3");
             }
             tdCheckReport.setDepart(ShiroUtils.getSysUser().getDept().getDeptName());
             tdCheckReport.setAdduser(ShiroUtils.getSysUser().getUserName());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/CheckReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/CheckReportController.java
index ec55f71..8960645 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/CheckReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/CheckReportController.java
@@ -173,6 +173,7 @@ public class CheckReportController extends BaseController {
     @PostMapping("/selfCheckSave")
     @ResponseBody
     public AjaxResult selfCheckSave(@RequestBody TdCheckReportDTO checkReportDTO) {
+        checkReportDTO.setCheckState("2");
         return toAjax(checkReportManager.saveOrUpdate(checkReportDTO));
     }
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/checkReport/checkReport.html b/ruoyi-admin/src/main/resources/templates/system/checkReport/checkReport.html
index 66c055e..3a51920 100644
--- a/ruoyi-admin/src/main/resources/templates/system/checkReport/checkReport.html
+++ b/ruoyi-admin/src/main/resources/templates/system/checkReport/checkReport.html
@@ -142,7 +142,7 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="openEdit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + selfCheckFlag + '" href="javascript:void(0)" onclick="selfcheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>自查</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + selfCheckFlag + '" href="javascript:void(0)" onclick="selfcheck(\'' + 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/checkresult/checkresult.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html
index 2829beb..25b2d8b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html
+++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html
@@ -138,7 +138,7 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="checkResultPrint(\'' + row.checkId + '\')"><i class="fa fa-download"></i>打印</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + checkresultFlag + '" href="javascript:void(0)" onclick="resultCheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>检查</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + checkresultFlag + '" href="javascript:void(0)" onclick="resultCheck(\'' + 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-system/src/main/resources/mapper/system/TdCheckReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml
index afd0eab..ec9f70c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml
@@ -39,7 +39,7 @@
             <if test="depart!=null and depart!=''">
                 AND depart = #{depart}
             </if>
-            AND  (check_type = '0' or check_type is null)
+            AND  check_state = '3'
         </trim>
         ORDER BY create_time DESC
     </select>
@@ -59,7 +59,7 @@
             <if test="depart!=null and depart!=''">
                 AND depart = #{depart}
             </if>
-            AND check_type in (0,1)
+            AND  check_state != '3'
         </trim>
         ORDER BY create_time DESC
     </select>