From 605ad7a7132c3b1ec7fa6b1ecba2e1113bacda3a Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Wed, 12 May 2021 15:17:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E8=80=83?=
 =?UTF-8?q?=E5=9C=BA=E4=BF=A1=E6=81=AF=E6=83=85=E5=86=B5=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tenlion/pojo/dtos/classplan/ClassPlanDTO.java  | 10 ++++++++++
 .../service/classplan/impl/ClassPlanServiceImpl.java   |  1 +
 .../static/route/classplan/list-report-exam.html       |  7 ++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/classplan/ClassPlanDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/classplan/ClassPlanDTO.java
index 0ee7aa9..1f21915 100644
--- a/src/main/java/cn/com/tenlion/pojo/dtos/classplan/ClassPlanDTO.java
+++ b/src/main/java/cn/com/tenlion/pojo/dtos/classplan/ClassPlanDTO.java
@@ -75,6 +75,8 @@ public class ClassPlanDTO {
     private String examType;
     @ApiModelProperty(name = "examReason", value = "考试申请原因")
     private String examReason;
+    @ApiModelProperty(name = "examStatus", value = "考点信息分配状态0未分配1已分配")
+    private String examStatus;
 
 
     public String getPlanNumber() {
@@ -279,4 +281,12 @@ public class ClassPlanDTO {
     public void setWaitSignUpUser(Integer waitSignUpUser) {
         this.waitSignUpUser = waitSignUpUser;
     }
+
+    public String getExamStatus() {
+        return examStatus == null ? "" : examStatus;
+    }
+
+    public void setExamStatus(String examStatus) {
+        this.examStatus = examStatus;
+    }
 }
diff --git a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java
index 3f16187..6adce95 100644
--- a/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/service/classplan/impl/ClassPlanServiceImpl.java
@@ -384,6 +384,7 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl
             item.setExamType("");
             if(examApplyDTO != null){
                 item.setExamType(examApplyDTO.getCheckStatus() + "");
+                item.setExamStatus(examApplyDTO.getStatus() + "");
             }
         }
         PageInfo<ClassPlanDTO> pageInfo = new PageInfo<>(classPlanDTOs);
diff --git a/src/main/resources/static/route/classplan/list-report-exam.html b/src/main/resources/static/route/classplan/list-report-exam.html
index ef08059..d220eb9 100644
--- a/src/main/resources/static/route/classplan/list-report-exam.html
+++ b/src/main/resources/static/route/classplan/list-report-exam.html
@@ -116,11 +116,15 @@
                                     dom += '<a type="button" class="layui-btn layui-btn-primary layui-btn-xs" lay-event="updateEvent">查看</a>';
                                     return dom;
                                 }
-                                if(row['examType'] === '1'){
+                                if(row['examType'] === '1' && row['examStatus'] === '1'){
                                     dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs">审核通过</a>';
                                     dom += '<a type="button" class="layui-btn layui-btn-primary layui-btn-xs" lay-event="showEvent">查看</a>';
                                     return dom;
                                 }
+                                if(row['examType'] === '1' && row['examStatus'] === '0'){
+                                    dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs">考场信息安排中</a>';
+                                    return dom;
+                                }
                                 if(row['examType'] === '2'){
                                     dom += '<a type="button" class="layui-btn layui-btn-danger layui-btn-xs">审核驳回</a>';
                                     dom += '<a type="button" class="layui-btn layui-btn-primary layui-btn-xs" lay-event="updateEvent">查看</a>';
@@ -292,6 +296,7 @@
                     anim: 2,
                     content: top.restAjax.path('route/classplan/update-report-exam.html?classPlanId={classPlanId}', [obj.data.classPlanId]),
                     end: function () {
+                        reloadTable();
                     }
                 });
             }