From 705d16733d7b81edaeafd7471d56f01b09f6f894 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Wed, 8 May 2024 11:25:39 +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
---
.../system/TdCheckResultController.java | 17 +--
.../templates/system/checkresult/add.html | 114 ------------------
.../templates/system/notify/add.html | 11 +-
.../templates/system/notify/notify.html | 8 +-
4 files changed, 20 insertions(+), 130 deletions(-)
delete mode 100644 ruoyi-admin/src/main/resources/templates/system/checkresult/add.html
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckResultController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckResultController.java
index 87424a9..a8620e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckResultController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdCheckResultController.java
@@ -57,7 +57,6 @@ public class TdCheckResultController extends BaseController {
return util.exportExcel(list, "检查结果管理数据");
}
-
/**
* 修改检查结果管理
*/
@@ -97,11 +96,12 @@ public class TdCheckResultController extends BaseController {
/**
* 检查 报告管理
*/
- @RequiresPermissions("system:checkresult:edit")
+ @RequiresPermissions("system:checkresult:check")
@GetMapping("/checkresult/{checkId}")
public String selfcheck(@PathVariable("checkId") Long checkId, ModelMap mmap)
{
TdCheck tdCheck = tdCheckService.selectTdCheckByCheckId(checkId);
+ mmap.put("sysuser",getSysUser());
mmap.put("tdCheck", tdCheck);
return prefix + "/docheck";
}
@@ -115,10 +115,16 @@ public class TdCheckResultController extends BaseController {
@ResponseBody
public AjaxResult selfcheckSave(TdCheck tdCheck)
{
+ if (tdCheck.getCheckresult1().equals("0")&&tdCheck.getCheckresult2().equals("0")
+ &&tdCheck.getCheckresult3().equals("0")&&tdCheck.getCheckresult4().equals("0")
+ &&tdCheck.getCheckresult5().equals("0")&&tdCheck.getCheckresult6().equals("0")){
+ tdCheck.setCheckState("0");
+ }else {
+ tdCheck.setCheckState("1");
+ }
return toAjax(tdCheckService.updateTdCheck(tdCheck));
}
-
/**
* 打印操作
*/
@@ -128,10 +134,7 @@ public class TdCheckResultController extends BaseController {
{
TdCheck tdCheckResult = tdCheckService.selectTdCheckByCheckId(checkId);
mmap.put("tdCheckResult", tdCheckResult);
- return prefix + "/CheckResultPrint";
+ return prefix + "/checkresultprint";
}
-
-
-
}
diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/add.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/add.html
deleted file mode 100644
index 59bd3e7..0000000
--- a/ruoyi-admin/src/main/resources/templates/system/checkresult/add.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/notify/add.html b/ruoyi-admin/src/main/resources/templates/system/notify/add.html
index 97e091f..10d8882 100644
--- a/ruoyi-admin/src/main/resources/templates/system/notify/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/notify/add.html
@@ -41,17 +41,18 @@
-