Merge branch 'feature-V2.0' of http://git.mooctest.com/crowd-2019/crowd-test-service-backend into feature-V2.0

 Conflicts:

	core/src/main/java/com/mooctest/crowd/domain/domainobject/EvaluationAgency.java

	site/src/main/java/com/mooctest/crowd/site/command/ApplyAgencyAuthCommand.java

core/src/main/java/com/mooctest/crowd/domain/domainobject/EvaluationAgency.java

@@ -17,13 +17,11 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class EvaluationAgency{
-    private  String idCardNum;
-    private String  legalPersonName;
+public class EvaluationAgency {
+    private String IdCardNum;
+    private String legalPersonName;
     private Long id;
     private Long userId;
-    private String  idCardBackPhoto;
-    private String idCardPositivePhoto;
     private String evaluationAgencyName;
     private String bankAccount;
     private String address;
@@ -38,21 +36,25 @@ public class EvaluationAgency{
     private Timestamp checkTime;
     private Timestamp applyTime;
     private String type;
+    private String sex;
+    private String idCardPositivePhoto;//身份证正面照
+    private String idCardBackPhoto;//身份证反面照
+    private Timestamp idCardDeadTime;
 
 //    public EvaluationAgency(EvaluationAgencyPO evaluationAgencyPO) {
 //        BeanUtils.copyProperties(evaluationAgencyPO, this,"evaluationAgencyResourceList", "evaluationAgencyAbilityList");
 //    }
 
-    public EvaluationAgency(EvaluationAgencyPO evaluationAgencyPO){
+    public EvaluationAgency(EvaluationAgencyPO evaluationAgencyPO) {
         id = evaluationAgencyPO.getId();
         agencyPhoto = evaluationAgencyPO.getAgencyPhoto();
         evaluationAgencyName = evaluationAgencyPO.getEvaluationAgencyName();
         userId = evaluationAgencyPO.getUserId();
         address = evaluationAgencyPO.getAddress();
-        updateTime=evaluationAgencyPO.getUpdateTime();
-        expireTime=evaluationAgencyPO.getExpireTime();
-        checkTime=evaluationAgencyPO.getCheckTime();
-        applyTime=evaluationAgencyPO.getApplyTime();
+        updateTime = evaluationAgencyPO.getUpdateTime();
+        expireTime = evaluationAgencyPO.getExpireTime();
+        checkTime = evaluationAgencyPO.getCheckTime();
+        applyTime = evaluationAgencyPO.getApplyTime();
         BeanUtils.copyProperties(evaluationAgencyPO, this);
 
     }

core/src/main/java/com/mooctest/crowd/domain/domainobject/User.java

@@ -3,9 +3,7 @@ package com.mooctest.crowd.domain.domainobject;
 import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.domain.exception.SystemAdministratorException;
 import com.mooctest.crowd.domain.model.UserPO;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
 import java.sql.Timestamp;
@@ -81,7 +79,7 @@ public class User {
      * @return
      */
     public User applyAgencyAuthentication(EvaluationAgency evaluationAgency) {
-        if (this.getPersonalAuthentication()!=null || this.getEnterpriseAuthentication()!=null || this.getPersonalAuthentication() != null)
+        if (this.getPersonalAuthentication()!=null || this.getEnterpriseAuthentication()!=null)
             throw new BaseException("已有认证信息，不可再次认证");
         this.setEvaluationAgency(evaluationAgency.applyAuthentication(this.id));
         return this;

site/src/main/java/com/mooctest/crowd/site/command/ApplyAgencyAuthCommand.java

@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 public class ApplyAgencyAuthCommand{
 
     @NotNull(message = "身份证号码不能为空")
-    private  String  idCardNum;
+    private  String  IdCardNum;
 
     @NotNull(message = "请选择性别")
     private String sex;