修改添加考场信息情况判断

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;
+    }
 }

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);

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();
                     }
                 });
             }