机构 表字段变更

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fatools/UserInfoNewOrg.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @description: 用户信息 机构
@@ -24,33 +25,70 @@ public class UserInfoNewOrg implements Serializable {
     private static final long serialVersionUID = 1L;
 
     //↓↓↓↓ 机构 ↓↓↓↓
-    @ApiModelProperty(value = "申请用户id")
-    private String applyUserId;
+//    @ApiModelProperty(value = "申请用户id")
+//    private String applyUserId;
+//    @ApiModelProperty(value = "机构id")
+//    private String userIdOrg;
+//    @ApiModelProperty(value = "公司名称")
+//    private String companyName;
+//    @ApiModelProperty(value = "公司全称")
+//    private String companyFullName;
+//    @ApiModelProperty(value = "营业执照账号")
+//    private String businessLicenseNumber;
+//    @ApiModelProperty(value = "营业执照 图片url")
+//    private String businessLicenseImageUrl;
+//    @ApiModelProperty(value = "机构用户身份公函 url")
+//    private String identityLetterUrl;
+//    @ApiModelProperty(value = "机构认证信息登记表 url")
+//    private String orgAuthInfoFormUrl;
+//    @ApiModelProperty(value = "运营人员 职位")
+//    private String position;
+//    @ApiModelProperty(value = "审核状态 1初始提交 2审核不通过 3审核通过")
+//    private Integer auditStatus;
+//    @ApiModelProperty(value = "认证名称")
+//    private String certName;
+//    @ApiModelProperty(value = "是否匹配现有基金公司 0不匹配 1匹配")
+//    private Integer isExistOrg;
+//    @ApiModelProperty(value = "所属基金公司id")
+//    private String belongOrgId;
+//    @ApiModelProperty(value = "所属基金公司类型 0公募 1私募")
+//    private Integer belongOrgType;
+
     @ApiModelProperty(value = "机构id")
-    private String userIdOrg;
-    @ApiModelProperty(value = "公司名称")
-    private String companyName;
+    private String corpId;
+    @ApiModelProperty(value = "公司简称")
+    private String corpShortName;
     @ApiModelProperty(value = "公司全称")
-    private String companyFullName;
+    private String corpName;
     @ApiModelProperty(value = "营业执照账号")
-    private String businessLicenseNumber;
+    private String corpOrganizationNumber;
     @ApiModelProperty(value = "营业执照 图片url")
-    private String businessLicenseImageUrl;
+    private String corpOrganizationImageUrl;
     @ApiModelProperty(value = "机构用户身份公函 url")
-    private String identityLetterUrl;
+    private String corpIdentityLetterUrl;
     @ApiModelProperty(value = "机构认证信息登记表 url")
-    private String orgAuthInfoFormUrl;
-    @ApiModelProperty(value = "运营人员 职位")
-    private String position;
-    @ApiModelProperty(value = "审核状态 1初始提交 2审核不通过 3审核通过")
+    private String corpAuthInfoFormUrl;
+    @ApiModelProperty(value = "申请用户id")
+    private String applyUserId;
+    @ApiModelProperty(value = "审核状态 0待审核 1通过 2驳回")
     private Integer auditStatus;
+    @ApiModelProperty(value = "审核时间")
+    private Date auditTime;
+    @ApiModelProperty(value = "运营人员姓名")
+    private String operatorName;
+    @ApiModelProperty(value = "运营人员职位")
+    private String operatorPosition;
+    @ApiModelProperty(value = "运营人员手机号码")
+    private String operatorMobilePhone;
+    @ApiModelProperty(value = "运营人员电子邮箱")
+    private String operatorEmail;
     @ApiModelProperty(value = "认证名称")
     private String certName;
     @ApiModelProperty(value = "是否匹配现有基金公司 0不匹配 1匹配")
-    private Integer isExistOrg;
+    private Integer relationFundCompanyExists;
     @ApiModelProperty(value = "所属基金公司id")
-    private String belongOrgId;
+    private String relationFundCompanyId;
     @ApiModelProperty(value = "所属基金公司类型 0公募 1私募")
-    private Integer belongOrgType;
+    private Integer relationFundCompanyType;
 
 }
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/manager/HomePageManager.java

@@ -95,28 +95,28 @@ public class HomePageManager {
         } else if (UserTypeEnum.USER_ORG.getCode() == userInfoNew.getUserType()) {
             // 机构账号
             userInfoNew.setPersonalCenterType(PersonalCenterTypeEnum.ORG.getCode());
-            if (FundCompanyTypeEnum.PUBLIC.getCode() == userInfoNew.getUserInfoNewOrg().getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getBelongOrgId())) { // 公募
+            if (FundCompanyTypeEnum.PUBLIC.getCode() == userInfoNew.getUserInfoNewOrg().getRelationFundCompanyType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getRelationFundCompanyId())) { // 公募
                 // 设置 基金数
-                CommonResp<FundCompanySimpleVO> companyFundCount = feignForPublicFund.getCompanyFundCount(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
+                CommonResp<FundCompanySimpleVO> companyFundCount = feignForPublicFund.getCompanyFundCount(userInfoNew.getUserInfoNewOrg().getRelationFundCompanyId());
                 userInfoNew.setFundNumber(companyFundCount.isSuccess() ? companyFundCount.getData().getFundCount() : 0);
                 // 设置成立时间 和 备案编号(公募没有备案编号)
-                CommonResp<FundCompanySimpleVO> fundCompanyInfoSimple = feignForPublicFund.getFundCompanyInfoSimple(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
+                CommonResp<FundCompanySimpleVO> fundCompanyInfoSimple = feignForPublicFund.getFundCompanyInfoSimple(userInfoNew.getUserInfoNewOrg().getRelationFundCompanyId());
                 if (fundCompanyInfoSimple.isSuccess()) {
                     FundCompanySimpleVO data = fundCompanyInfoSimple.getData();
                     userInfoNew.setFounded(data.getEstablishDate());
                     userInfoNew.setRecordNumber(data.getRegisterNumber());
                 }
             }
-            if (FundCompanyTypeEnum.PRIVATE.getCode() == userInfoNew.getUserInfoNewOrg().getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getBelongOrgId())) { // 私募
+            if (FundCompanyTypeEnum.PRIVATE.getCode() == userInfoNew.getUserInfoNewOrg().getRelationFundCompanyType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getRelationFundCompanyId())) { // 私募
                 // 设置成立时间 和 备案编号
-                CommonResp<FundCompanySimpleVO> fundCompanyInfoSimple = feignForFund.getFundCompanyInfoSimple(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
+                CommonResp<FundCompanySimpleVO> fundCompanyInfoSimple = feignForFund.getFundCompanyInfoSimple(userInfoNew.getUserInfoNewOrg().getRelationFundCompanyId());
                 if (fundCompanyInfoSimple.isSuccess()) {
                     FundCompanySimpleVO data = fundCompanyInfoSimple.getData();
                     userInfoNew.setFounded(data.getEstablishDate());
                     userInfoNew.setRecordNumber(data.getRegisterNumber());
                 }
                 // 设置 基金数
-                CommonResp<FundCompanySimpleVO> companyFundCount = feignForFund.getCompanyFundCount(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
+                CommonResp<FundCompanySimpleVO> companyFundCount = feignForFund.getCompanyFundCount(userInfoNew.getUserInfoNewOrg().getRelationFundCompanyId());
                 userInfoNew.setFundNumber(companyFundCount.isSuccess() ? companyFundCount.getData().getFundCount() : 0);
             }
             //设置团队成员