From ee73a6a096afd4fa3d616be1fa3628c22e461ff0 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Tue, 9 Jul 2024 15:13:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=94=99=E9=A2=98=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/count/TdExamnumController.java     |  68 ++------
 .../templates/system/examnum/examnum.html     | 162 +++++++++---------
 2 files changed, 88 insertions(+), 142 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdExamnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdExamnumController.java
index 5c253f9..52737ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdExamnumController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdExamnumController.java
@@ -1,6 +1,10 @@
 package com.ruoyi.web.controller.system.count;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.userexam.dto.request.UserExamReqDTO;
+import com.ruoyi.system.domain.userexam.dto.response.UserExamRespDTO;
+import com.ruoyi.web.controller.manager.UserExamManager;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -20,6 +24,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -37,6 +42,9 @@ public class TdExamnumController extends BaseController
     @Autowired
     private ITdExamnumService tdExamnumService;
 
+    @Resource
+    private UserExamManager userExamManager;
+
     @RequiresPermissions("system:examnum:view")
     @GetMapping()
     public String examnum()
@@ -50,10 +58,9 @@ public class TdExamnumController extends BaseController
     @RequiresPermissions("system:examnum:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(TdExamnum tdExamnum)
-    {
+    public TableDataInfo list(UserExamReqDTO reqDTO) {
         startPage();
-        List<TdExamnum> list = tdExamnumService.selectTdExamnumList(tdExamnum);
+        List<UserExamRespDTO> list = userExamManager.selectExamList(reqDTO);
         return getDataTable(list);
     }
 
@@ -71,62 +78,7 @@ public class TdExamnumController extends BaseController
         return util.exportExcel(list, "考试结果数据");
     }
 
-    /**
-     * 新增考试结果
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存考试结果
-     */
-    @RequiresPermissions("system:examnum:add")
-    @Log(title = "考试结果", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(TdExamnum tdExamnum)
-    {
-        return toAjax(tdExamnumService.insertTdExamnum(tdExamnum));
-    }
-
-    /**
-     * 修改考试结果
-     */
-    @RequiresPermissions("system:examnum:edit")
-    @GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") Long id, ModelMap mmap)
-    {
-        TdExamnum tdExamnum = tdExamnumService.selectTdExamnumById(id);
-        mmap.put("tdExamnum", tdExamnum);
-        return prefix + "/edit";
-    }
 
-    /**
-     * 修改保存考试结果
-     */
-    @RequiresPermissions("system:examnum:edit")
-    @Log(title = "考试结果", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(TdExamnum tdExamnum)
-    {
-        return toAjax(tdExamnumService.updateTdExamnum(tdExamnum));
-    }
-
-    /**
-     * 删除考试结果
-     */
-    @RequiresPermissions("system:examnum:remove")
-    @Log(title = "考试结果", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        return toAjax(tdExamnumService.deleteTdExamnumByIds(ids));
-    }
 
 
 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html b/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html
index dd2a8e2..b682a4e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html
+++ b/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html
@@ -1,102 +1,96 @@
 <!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('考试结果列表')" />
+	<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="userName"/>
-                            </li>
-                            <li>
-                                <label>单位名称：</label>
-                                <input type="text" name="dept"/>
-                            </li>
-                            <li>
-                                <label>试题类型：</label>
-                                <select name="type" th:with="type=${@dict.getType('td_question_type')}">
-                                    <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="container-div">
+		<div class="row">
+			<div class="col-sm-12 search-collapse">
+				<form id="notice-form">
+					<div class="select-list">
+						<ul>
+							<li>
+								搜索人员：<input type="text" name="userName"/>
+								<input type="hidden" name="examId" th:value="*{examId}"/>
+							</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:examnum: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 class="btn-group-sm" id="toolbar" role="group">
+
+	        </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:examnum:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:examnum:remove')}]];
-        var typeDatas = [[${@dict.getType('td_question_type')}]];
         var prefix = ctx + "system/examnum";
-
+		var prefixUser = ctx + "system/userExam";
         $(function() {
             var options = {
+				uniqueId: "id",
                 url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "考试结果",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field: 'id',
-                    title: 'id',
-                    visible: false
-                },
-                {
-                    field: 'userName',
-                    title: '考试姓名'
-                },
-                {
-                    field: 'examResult',
-                    title: '考试分数'
-                },
-                {
-                    field: 'startTime',
-                    title: '开始时间'
-                },
-                {
-                    field: 'endTime',
-                    title: '结束时间'
-                },
-                {
-                    field: 'dept',
-                    title: '单位名称'
-                },
-                {
-                    field: 'type',
-                    title: '试题类型',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(typeDatas, value);
-                    }
-                }]
+                modalName: "考试",
+                columns: [
+				{
+					field : 'userName',
+					title : '人员'
+				},
+				{
+					field: 'tryCount',
+					title: '考试次数'
+				},
+				{
+					field: 'maxScore',
+					title: '最高分',
+					align: 'center'
+				},
+				{
+					field: 'passed',
+					title: '是否通过',
+					formatter: function(value, row, index) {
+						if(value=='1'){
+							return '通过';
+						}else{
+							return '未通过';
+						}
+
+					}
+				},
+				{
+		            field: 'updateTime',
+		            title: '最后考试时间',
+		            sortable: true
+		        },
+		        {
+		            title: '操作',
+		            align: 'center',
+		            formatter: function(value, row, index) {
+		            	var actions = [];
+		            	actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="detail(\'' + row.examId + '\',\'' + row.userId + '\')"><i class="fa fa-search"></i>考试明细</a> ');
+						return actions.join('');
+		            }
+		        }]
             };
             $.table.init(options);
         });
+
+
+		/*资产列表-详细*/
+		function detail(id,userId) {
+			var url = prefixUser + '/detail/' + id +'/'+userId;
+			$.modal.open("考试明细", url);
+		}
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>