修改个人认证和机构认证的内容

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

@@ -5,6 +5,7 @@ import com.mooctest.crowd.domain.model.EnterpriseAuthenticationPO;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
+import java.sql.Date;
 import java.sql.Timestamp;
 
 /**
@@ -17,11 +18,11 @@ public class EnterpriseAuthentication {
     private String enterpriseName;
     private Long id;
     private Long userId;
-    private String IDCardNum;//身份证号码
+    private String idCardNum;//身份证号码
     private String legalPersonName;
     private String businessLicensePhoto;
     private String unifiedSocialCreditCode;
-    private String sex;//2.0新加性别
+    private String gender;//2.0新加性别
     private String idCardPositivePhoto;//身份证正面照
     private String idCardBackPhoto;//身份证反面照
     private String address;
@@ -30,7 +31,7 @@ public class EnterpriseAuthentication {
     private String explain;
     private Timestamp applyTime;
     private Timestamp checkTime;
-    private Timestamp IDCardDeadTime;//身份证过期时间
+    private Date idCardDeadTime;//身份证过期时间
     private String type;
 
 

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
+import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -18,16 +19,23 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class EvaluationAgency {
-    private String IdCardNum;
+
+    private String evaluationAgencyName;
+    private String businessLicensePhoto;
+    private String address;
+    private String agencyPhoto;
     private String legalPersonName;
+    private String IdCardNum;
+    private String gender;
+    private String idCardPositivePhoto;//身份证正面照
+    private String idCardBackPhoto;//身份证反面照
+    private Date idCardDeadTime;
+
     private Long id;
     private Long userId;
-    private String evaluationAgencyName;
     private String bankAccount;
-    private String address;
     private List<EvaluationAgencyAbility> evaluationAgencyAbilityList;
     private List<EvaluationAgencyResource> evaluationAgencyResourceList;
-    private String agencyPhoto;
     private int isAuthentication;
     private String explain;
     private int isDeleted;
@@ -36,10 +44,7 @@ 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");

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

@@ -4,8 +4,8 @@ import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.domain.model.PersonalAuthenticationPO;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
-import java.util.*;
 
+import java.sql.Date;
 import java.sql.Timestamp;
 
 /**
@@ -14,16 +14,14 @@ import java.sql.Timestamp;
  */
 @Data
 public class PersonalAuthentication {
-
-
     private Long id;
     private Long userId;
     private String realName;
-    private String IDCard;
-    private String IDCardPhoto;
-    private String IDCardPositivePhoto;//身份证正面照片
-    private String IDCardBackPhoto;//身份证反面照片
-    private String sex;
+    private String idCard;
+    private String idCardPhoto;
+    private String idCardPositivePhoto;//身份证正面照片
+    private String idCardBackPhoto;//身份证反面照片
+    private String gender;
     private String bankAccount;
     private String address;
     private int isDeleted;
@@ -31,7 +29,7 @@ public class PersonalAuthentication {
     private String explain;
     private Timestamp applyTime;
     private Timestamp checkTime;
-    private Timestamp IDCardDeadTime;//身份证过期时间
+    private Date idCardDeadTime;//身份证过期时间
     private String type;
 
     /**
@@ -46,8 +44,8 @@ public class PersonalAuthentication {
 //        this.realName = authenticationPO.getRealName();
 //        this.address = authenticationPO.getAddress();
 //        this.applyTime = authenticationPO.getApplyTime();
-//        this.IDCard = authenticationPO.getIDCard();
-//        this.IDCardBackPhoto = authenticationPO.getIDCardPhoto();
+//        this.idCard = authenticationPO.getidCard();
+//        this.idCardBackPhoto = authenticationPO.getidCardPhoto();
 //        this.type = authenticationPO.getType();
 
     }

core/src/main/java/com/mooctest/crowd/domain/model/EvaluationAgencyPO.java

@@ -3,6 +3,7 @@ package com.mooctest.crowd.domain.model;
 import lombok.Data;
 
 import javax.persistence.*;
+import java.sql.Date;
 import java.sql.Timestamp;
 
 /**
@@ -11,7 +12,7 @@ import java.sql.Timestamp;
  */
 @Data
 @Entity(name = "evaluation_agency")
-public class EvaluationAgencyPO{
+public class EvaluationAgencyPO {
 
     @Id
     @Column(name = "EA_ID")
@@ -33,6 +34,30 @@ public class EvaluationAgencyPO{
     @Column(name = "EA_PHOTO")
     private String agencyPhoto;
 
+    @Column(name = "EA_TYPE")
+    private String type;
+
+    @Column(name = "EA_ID_CARD_NUM")
+    private String idCardNum;
+
+    @Column(name = "EA_ID_CARD_BACK_PHOTO")
+    private String idCardBackPhoto;//身份证反面照片
+
+    @Column(name = "EA_ID_CARD_POSITIVE_PHOTO")
+    private String idCardPositivePhoto;//身份证正面照片
+
+    @Column(name = "EA_BUSINESS_LICENSE_PHOTO")
+    private String businessLicensePhoto;
+
+    @Column(name = "EA_LEGAL_PERSON_NAME")
+    private String legalPersonName;
+
+    @Column(name = "EA_GENDER")
+    private String gender;
+
+    @Column(name = "EA_ID_CARD_DEAD_TIME")
+    private Date idCardDeadTime;
+
     @Column(name = "EA_UPDATE_TIME")
     private Timestamp updateTime;
 
@@ -53,19 +78,4 @@ public class EvaluationAgencyPO{
 
     @Column(name = "EA_CHECK_TIME")
     private Timestamp checkTime;
-
-    @Column(name = "EA_TYPE")
-    private String type;
-
-    @Column(name = "EA_IDNUM")
-    private  String idCardNum;
-
-    @Column(name = "EA_IDCARD_BACK_OHOTO")
-    private  String  idCardBackPhoto;//身份证反面照片
-
-
-    @Column(name = "EA_IDCARD_POSITIVE_PHOTO")
-    private   String idCardPositivePhoto;//身份证正面照片
-
-
 }

core/src/main/java/com/mooctest/crowd/domain/model/PersonalAuthenticationPO.java

@@ -3,6 +3,7 @@ package com.mooctest.crowd.domain.model;
 import lombok.Data;
 
 import javax.persistence.*;
+import java.sql.Date;
 import java.sql.Timestamp;
 
 /**
@@ -26,10 +27,10 @@ public class PersonalAuthenticationPO {
     private String realName;
 
     @Column(name = "PA_ID_CARD")
-    private String IDCard;
+    private String idCard;
 
     @Column(name = "PA_ID_CARD_PHOTO")
-    private String IDCardPhoto;
+    private String idCardPhoto;
 
     @Column(name = "PA_BANK_ACCOUNT")
     private String bankAccount;
@@ -53,16 +54,16 @@ public class PersonalAuthenticationPO {
     private Timestamp checkTime;
 
     @Column(name = "PA_ID_CARD_POS_PHOTO")
-    private String  IDCardPositivePhoto;//身份证正面照片
+    private String idCardPositivePhoto;//身份证正面照片
 
     @Column(name = "PA_ID_CARD_BACK_PHOTO")
-    private String  IDCardBackPhoto;//身份证正面照片
+    private String idCardBackPhoto;//身份证正面照片
 
     @Column(name = "PA_EXPIRE_TIME")
-    private Timestamp  IDCardDeadTime;
+    private Date idCardDeadTime;
 
-    @Column(name = "PA_Sex")
-    private  String  sex;
+    @Column(name = "PA_GENDER")
+    private String gender;
 
     @Column(name = "PA_TYPE")
     private String type;

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

@@ -6,8 +6,9 @@ import com.mooctest.crowd.domain.domainobject.EvaluationAgencyAbility;
 import com.mooctest.crowd.domain.factory.UserFactory;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
+
 import javax.validation.constraints.NotNull;
-import java.sql.Timestamp;
+import java.sql.Date;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -20,31 +21,34 @@ import java.util.stream.Collectors;
 @Data
 public class ApplyAgencyAuthCommand{
 
+    @NotNull(message = "企业名称不可为空")
+    private String evaluationAgencyName;
+    @NotNull(message = "营业执照图片不可为空")
+    private String businessLicensePhoto;
+    @NotNull(message = "企业地址不可为空")
+    private String address;
+    @NotNull(message = "LOGO不可为空")
+    private String agencyPhoto;
+
+    @NotNull(message = "法人姓名不能为空")
+    private  String legalPersonName;
     @NotNull(message = "身份证号码不能为空")
     private  String  IdCardNum;
-
     @NotNull(message = "请选择性别")
-    private String sex;
-//    @NotNull(message = "机构名称不可为空")
-    private String evaluationAgencyName;
+    private String gender;
     @NotNull(message = "请上传身份证正面照")
     private String idCardPositivePhoto;//身份证正面照
     @NotNull(message = "请上传身份证反面照")
     private String idCardBackPhoto;//身份证反面照
     @NotNull(message = "请正确填写身份证过期时间")
-    private Timestamp idCardDeadTime;
-    @NotNull(message = "机构地址不可为空")
-    private String address;
+    private Date idCardDeadTime;
+    @NotNull(message = "请选择企业认证类型")
+    private ArrayList<Integer> roleList;
+
 //    @NotNull(message = "评测能力不可为空")
     private List<String> evaluationAgencyAbilityList;
 //    @NotNull(message = "机构资源不可为空")
     private List<AgencyResourceCommand> evaluationAgencyResourceList;
-//    @NotNull(message = "LOGO不可为空")
-    private String agencyPhoto;
-    @NotNull(message = "请选择认证研发机构或者评测机构")
-    private ArrayList<Integer> roleList;
-//    @NotNull(message = "法人姓名不能为空")
-    private  String legalPersonName;
 
     public EvaluationAgency toAgency(){
         EvaluationAgency agency = UserFactory.defaultAgency();

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

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
 import javax.validation.constraints.NotNull;
+import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 
@@ -34,13 +35,13 @@ public class ApplyEnterpriseAuthCommand {
     @NotNull(message = "地址不可为空")
     private String address;
     @NotNull(message = "请选择性别")
-    private String sex;
+    private String gender;
     @NotNull(message = "请上传身份证正面照")
     private String idCardPositivePhoto;//身份证正面照
     @NotNull(message = "请上传身份证反面照")
     private String idCardBackPhoto;//身份证反面照
     @NotNull(message = "请正确填写身份证过期时间")
-    private Timestamp idCardDeadTime;
+    private Date idCardDeadTime;
 
     public EnterpriseAuthentication toEnterpriseAuth() {
         EnterpriseAuthentication enterpriseAuthentication = new EnterpriseAuthentication();

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

@@ -8,6 +8,7 @@ import org.springframework.beans.BeanUtils;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -19,37 +20,35 @@ import java.util.List;
 @Data
 public class ApplyPersonalAuthCommand {
 
-    @NotNull(message = "请选择成为接包用户还是发包用户")
-    private List<Integer> roleList;
-
-    private String userId;
-
     @NotNull(message = "请填写真实姓名")
     private String realName;
 
-    //    @NotNull(message = "请选择性别")
-    private String sex;
+    @NotNull(message = "请选择性别")
+    private String gender;
 
-    @JsonProperty(value = "IDCard")
+    @JsonProperty(value = "idCard")
     @NotNull(message = "请填写身份证号码")
     @Pattern(regexp = "\\d{15}(\\d{2}[0-9xX])?", message = "身份证号格式错误")
-    private String IDCard;
+    private String idCard;
 
-    @JsonProperty(value = "IDCardPositivePhoto")
+    @JsonProperty(value = "idCardPositivePhoto")
     @NotNull(message = "请上传身份证正面图片")
-    private String IDCardPositivePhoto;
+    private String idCardPositivePhoto;
 
-    @JsonProperty(value = "IDCardBackPhoto")
-//    @NotNull(message = "请上传身份证反面图片")
-    private String IDCardBackPhoto;
+    @JsonProperty(value = "idCardBackPhoto")
+    @NotNull(message = "请上传身份证反面图片")
+    private String idCardBackPhoto;
 
-    @JsonProperty(value = "IDCardDeadTime")
-//    @NotNull(message = "请正确填写身份证过期时间")
-    private Timestamp IDCardDeadTime;
+    @JsonProperty(value = "idCardDeadTime")
+    @NotNull(message = "请正确填写身份证过期时间")
+    private Date idCardDeadTime;
 
     @NotNull(message = "请填写单位或者家庭地址")
     private String address;
 
+    @NotNull(message = "请选择个人认证类型")
+    private List<Integer> roleList;
+
     public PersonalAuthentication toPersonalAuth() {
         PersonalAuthentication personalAuthentication = new PersonalAuthentication();
         BeanUtils.copyProperties(this, personalAuthentication);

site/src/main/java/com/mooctest/crowd/site/data/vo/AgencyVO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
+import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -39,10 +40,10 @@ public class AgencyVO {
     private String IdCardNum;
     private String legalPersonName;
     private Long id;
-    private String sex;
+    private String gender;
     private String idCardPositivePhoto;//身份证正面照
     private String idCardBackPhoto;//身份证反面照
-    private Timestamp idCardDeadTime;
+    private Date idCardDeadTime;
 
 
     public AgencyVO(EvaluationAgency agency){

site/src/main/java/com/mooctest/crowd/site/data/vo/EnterpriseAuthVO.java

@@ -5,6 +5,7 @@ import com.mooctest.crowd.domain.domainobject.EnterpriseAuthentication;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
+import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -18,11 +19,11 @@ public class EnterpriseAuthVO {
     private Long id;
     private Long userId;
     private String enterpriseName;
-    private String IDCardNum;//身份证号码
+    private String idCardNum;//身份证号码
     private String legalPersonName;
     private String businessLicensePhoto;
     private String unifiedSocialCreditCode;
-    private String sex;//2.0新加性别
+    private String gender;//2.0新加性别
     private String idCardPositivePhoto;//身份证正面照
     private String idCardBackPhoto;//身份证反面照
     private String address;
@@ -31,7 +32,7 @@ public class EnterpriseAuthVO {
     private String explain;
     private Timestamp applyTime;
     private Timestamp checkTime;
-    private Timestamp IDCardDeadTime;//身份证过期时间
+    private Date idCardDeadTime;//身份证过期时间
     private StatusVO authStatus;
     private List<String> type;
 

site/src/main/java/com/mooctest/crowd/site/data/vo/PersonalAuthVO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
+import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -18,9 +19,9 @@ import java.util.List;
 @NoArgsConstructor
 public class PersonalAuthVO {
 
+    private Long userId;
     private String realName;
-    private String IDCard;
-    private String IDCardPhoto;
+    private String idCard;
     private String bankAccount;
     private String address;
     private int isDeleted;
@@ -29,9 +30,10 @@ public class PersonalAuthVO {
     private Timestamp applyTime;
     private Timestamp checkTime;
     private StatusVO authStatus;
-    private String IDCardPositivePhoto;//身份证正面照片
-    private String IDCardBackPhoto;//身份证反面照片
-    private String sex;
+    private String idCardPositivePhoto;//身份证正面照片
+    private String idCardBackPhoto;//身份证反面照片
+    private Date idCardDeadTime;//身份证过期时间
+    private String gender;
     private List<String> type;
 
     public PersonalAuthVO(PersonalAuthentication personalAuthentication) {
@@ -44,6 +46,4 @@ public class PersonalAuthVO {
         this.authStatus.initAuthStatus(this.isAuthentication);
 
     }
-
-
 }

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

@@ -972,11 +972,11 @@ public class WebMediatorImpl implements ViewMediator {
             return new BaseAuthVO(personalAuthentication);
         }).collect(Collectors.toList()));
 
-        authingList.addAll(enterpriseAuthenticationDao.findByIsAuthentication(AuthenticationStatus.isAuthenIng).stream().map(enterpriseAuthenticationPO -> {
-            EnterpriseAuthentication enterpriseAuthentication = new EnterpriseAuthentication();
-            BeanUtils.copyProperties(enterpriseAuthenticationPO, enterpriseAuthentication);
-            return new BaseAuthVO(enterpriseAuthentication);
-        }).collect(Collectors.toList()));
+//        authingList.addAll(enterpriseAuthenticationDao.findByIsAuthentication(AuthenticationStatus.isAuthenIng).stream().map(enterpriseAuthenticationPO -> {
+//            EnterpriseAuthentication enterpriseAuthentication = new EnterpriseAuthentication();
+//            BeanUtils.copyProperties(enterpriseAuthenticationPO, enterpriseAuthentication);
+//            return new BaseAuthVO(enterpriseAuthentication);
+//        }).collect(Collectors.toList()));
 
         authingList.addAll(agencyDao.findByIsAuthentication(AuthenticationStatus.isAuthenIng).stream().map(evaluationAgencyPO -> {
             EvaluationAgency agency = new EvaluationAgency();