From 392461e398d24dede71672cbaa91d8fe460c219e Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Wed, 12 May 2021 14:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=97=B6=E9=97=B4=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/classplan/class-plan-mapper.xml    |  2 +-
 .../static/route/classplan/list.html          | 23 +++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml b/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml
index 8bfdf82..7e2736d 100644
--- a/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml
+++ b/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml
@@ -300,7 +300,7 @@
             AND t1.sign_up_end_time <![CDATA[ >= ]]> #{signNowDate}
         </if>
         <if test="examNowDate != null and examNowDate != ''">
-            AND t1.sign_up_end_time <![CDATA[ <= ]]> #{examNowDate}
+            AND t1.plan_end_time <![CDATA[ <= ]]> #{examNowDate}
         </if>
         <if test="planType != null and planType != ''">
             AND t1.plan_type = #{planType}
diff --git a/src/main/resources/static/route/classplan/list.html b/src/main/resources/static/route/classplan/list.html
index 98741d9..afb986d 100644
--- a/src/main/resources/static/route/classplan/list.html
+++ b/src/main/resources/static/route/classplan/list.html
@@ -105,18 +105,14 @@
                     [
                         {type:'checkbox', fixed: 'left'},
                         {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
-                        {width:200, title: '操作', fixed: 'left', align:'center',
+                        {width:100, title: '审核状态', fixed: 'left', align:'center',
                             templet: function(row) {
                                 var dom = '';
-                                if(row['reportType'] === '0'){
-                                    return '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reportEvent">开班报备</a>';
-                                }
                                 if(row['reportType'] === '1'){
                                     return '<a type="button" class="layui-btn layui-btn-warm layui-btn-xs">报备待审</a>';
                                 }
                                 if(row['reportType'] === '2'){
                                     dom += '<a type="button" class="layui-btn layui-btn-info layui-btn-xs">审核通过</a>';
-                                    dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="signUpUserEvent">报名人员</a>'
                                     return dom;
                                 }
                                 if(row['reportType'] === '3'){
@@ -125,6 +121,22 @@
                                 return dom;
                             }
                         },
+                        {width:100, title: '操作', fixed: 'left', align:'center',
+                            templet: function(row) {
+                                var dom = '';
+                                if(row['reportType'] === '0'){
+                                    return '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reportEvent">开班报备</a>';
+                                }
+                                if(row['reportType'] === '2'){
+                                    dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="signUpUserEvent">报名人员</a>';
+                                    return dom;
+                                }
+                                if(row['reportType'] === '3'){
+                                    return '<a type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="unPassEvent">重新审核</a>';
+                                }
+                                return dom;
+                            }
+                        },
                         {field: 'planNumber', width: 190, title: '培训计划编号', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];
@@ -449,6 +461,7 @@
                     anim: 2,
                     content: top.restAjax.path('route/classplan/list-signup-user.html?classPlanId={classPlanId}', [obj.data.classPlanId]),
                     end: function () {
+                        reloadTable();
                     }
                 });
             }