Browse Source

增加企业认证申请时间applyTime字段

guochao 5 years ago
parent
commit
3d5f2dbf6c

+ 2 - 1
site/src/main/java/com/mooctest/crowd/site/data/vo/AgencyVO.java

@@ -1,6 +1,5 @@
 package com.mooctest.crowd.site.data.vo;
 
-import com.mooctest.crowd.domain.domainobject.AuthenticationStatus;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgency;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgencyAbility;
 import lombok.Data;
@@ -33,6 +32,8 @@ public class AgencyVO {
     private Timestamp expireTime;
     private Timestamp createTime;
     private StatusVO authStatus;
+    private Timestamp applyTime;
+
 
     public AgencyVO(EvaluationAgency agency){
         BeanUtils.copyProperties(agency, this, "evaluationAgencyResourceList", "evaluationAgencyAbilityList");

+ 1 - 1
site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -479,7 +479,7 @@ public class WebMediatorImpl implements ViewMediator {
             }
         }
         //评测机构视角
-        if (user.getRoleList().stream().anyMatch(role -> role.getName().equals("evaluationAgency") || role.getName().equals("generalUser")) && task.getStatus()!=CrowdTestTaskStatus.HAS_REJECTED){
+        if (user.getRoleList().stream().anyMatch(role -> role.getName().equals("evaluationAgency")) && task.getStatus()!=CrowdTestTaskStatus.HAS_REJECTED){
             if ((task.getDistributionType()==0 && task.getEvaluationAgencyId().equals(user.getId()))
                     ||(task.getDistributionType()==2 && task.getStatus()>=CrowdTestTaskStatus.HAS_RECEIVED && task.getEvaluationAgencyId().equals(user.getId()))){
                 if (task.getStatus()==CrowdTestTaskStatus.HAS_RELEASED){