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 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 += '查看'; return dom; } - if(row['examType'] === '1'){ + if(row['examType'] === '1' && row['examStatus'] === '1'){ dom += '审核通过'; dom += '查看'; return dom; } + if(row['examType'] === '1' && row['examStatus'] === '0'){ + dom += '考场信息安排中'; + return dom; + } if(row['examType'] === '2'){ dom += '审核驳回'; dom += '查看'; @@ -292,6 +296,7 @@ anim: 2, content: top.restAjax.path('route/classplan/update-report-exam.html?classPlanId={classPlanId}', [obj.data.classPlanId]), end: function () { + reloadTable(); } }); }