From e1c5c7da69e187b086810b9df483778469bead23 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Mon, 15 Apr 2024 11:48:47 +0800
Subject: [PATCH] user

---
 .../system/SysUserExamineController.java         | 10 ++++++++++
 .../controller/system/TdExamnumController.java   |  6 +-----
 .../controller/system/TdUserExamController.java  |  3 +++
 .../src/main/resources/static/ruoyi/js/ry-ui.js  | 15 +++++++++++++++
 .../ruoyi/common/core/domain/entity/SysUser.java | 16 ++++++++--------
 5 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java
new file mode 100644
index 0000000..17555b5
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java
@@ -0,0 +1,10 @@
+package com.ruoyi.web.controller.system;
+
+import com.ruoyi.common.core.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/")
+public class SysUserExamineController extends BaseController {
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java
index 7256095..37c5b9b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdExamnumController.java
@@ -128,9 +128,5 @@ public class TdExamnumController extends BaseController
         return toAjax(tdExamnumService.deleteTdExamnumByIds(ids));
     }
 
-    /**
-     * 将前端的考试结果进行保存
-     * @param
-     */
-    // 新增提交
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdUserExamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdUserExamController.java
index 5690aee..e551c19 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdUserExamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdUserExamController.java
@@ -10,6 +10,9 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+/**
+ * 涉密人员培训Controller
+ */
 @Controller
 @RequestMapping("/system/userexam")
 public class TdUserExamController extends BaseController {
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 2a306cb..b2b2d16 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -1153,6 +1153,21 @@ var table = {
                     $.modal.open("修改" + table.options.modalName, $.operate.editUrl(id));
                 }
             },
+            // examine: function(id) {
+            //     table.set();
+            //     if ($.common.isEmpty(id) && table.options.type == table_type.bootstrapTreeTable) {
+            //         var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0];
+            //         if ($.common.isEmpty(row)) {
+            //             $.modal.alertWarning("请至少选择一条记录");
+            //             return;
+            //         }
+            //         var url = table.options.updateUrl.replace("{id}", row[table.options.uniqueId]);
+            //         $.modal.open("审核" + table.options.modalName, url);
+            //     } else {
+            //         $.modal.open("审核" + table.options.modalName, $.operate.editUrl(id));
+            //     }
+            // },
+
             // 修改信息，以tab页展现
             editTab: function(id) {
                 table.set();
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 3bba984..3e75e2b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -149,19 +149,19 @@ public class SysUser extends BaseEntity
     }
 
     public String getStartdata() {
-        return startdata;
+        return startdate;
     }
 
     public void setStartdata(String startdata) {
-        this.startdata = startdata;
+        this.startdate = startdata;
     }
 
     public String getEnddata() {
-        return enddata;
+        return enddate;
     }
 
     public void setEnddata(String enddata) {
-        this.enddata = enddata;
+        this.enddate = enddata;
     }
 
     public String getHelthy() {
@@ -186,11 +186,11 @@ public class SysUser extends BaseEntity
 
     /** 生效时间 */
     @Excel(name = "生效时间")
-    private String startdata;
+    private String startdate;
 
     /** 失效时间 */
     @Excel(name = "失效时间")
-    private String enddata;
+    private String enddate;
 
     /** 健康状况 */
     @Excel(name = "健康状况")
@@ -492,8 +492,8 @@ public class SysUser extends BaseEntity
                 ", politics='" + politics + '\'' +
                 ", shemichengdu='" + shemichengdu + '\'' +
                 ", graduate='" + graduate + '\'' +
-                ", startdata='" + startdata + '\'' +
-                ", enddata='" + enddata + '\'' +
+                ", startdate='" + startdate + '\'' +
+                ", enddate='" + enddate + '\'' +
                 ", helthy='" + helthy + '\'' +
                 ", dept=" + dept +
                 ", roles=" + roles +