Merge branch 'dev' of 47.100.44.39:tp-backend/tanpu-community into dev

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

@@ -37,8 +37,8 @@ public class UserInfoResp {
     @ApiModelProperty("基金数")
     private Integer fundNumber = 0;
 
-    @ApiModelProperty("成立时间")
-    private long founded;
+    @ApiModelProperty("成立时间 yyyy-MM-dd")
+    private String founded;
     @ApiModelProperty("备案编号")
     private String recordNumber = "-";
     @ApiModelProperty("团队成员")

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

@@ -6,6 +6,7 @@ import com.tanpu.biz.common.enums.user.UserTypeEnum;
 import com.tanpu.common.api.CommonResp;
 import com.tanpu.common.constant.BizStatus;
 import com.tanpu.common.exception.BizException;
+import com.tanpu.common.util.DateUtils;
 import com.tanpu.community.api.beans.qo.FollowQo;
 import com.tanpu.community.api.beans.req.homepage.FollowRelReq;
 import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
@@ -113,7 +114,7 @@ public class HomePageManager {
                 CommonResp<FundCompanySimpleVO> fundCompanyInfoSimple = feignForPublicFund.getFundCompanyInfoSimple(userInfoNew.getUserInfoNewOrg().getRelationFundCompanyId());
                 if (fundCompanyInfoSimple.isSuccess()) {
                     FundCompanySimpleVO data = fundCompanyInfoSimple.getData();
-                    userInfoNew.setFounded(data.getEstablishDate());
+                    userInfoNew.setFounded(data.getEstablishDate() > 0 ? DateUtils.formatYMD(new Date(data.getEstablishDate())) : null);
                     userInfoNew.setRecordNumber(data.getRegisterNumber());
                 }
             }
@@ -122,7 +123,7 @@ public class HomePageManager {
                 CommonResp<FundCompanySimpleVO> fundCompanyInfoSimple = feignForFund.getFundCompanyInfoSimple(userInfoNew.getUserInfoNewOrg().getRelationFundCompanyId());
                 if (fundCompanyInfoSimple.isSuccess()) {
                     FundCompanySimpleVO data = fundCompanyInfoSimple.getData();
-                    userInfoNew.setFounded(data.getEstablishDate() > 0 ? data.getEstablishDate() : null);
+                    userInfoNew.setFounded(data.getEstablishDate() > 0 ? DateUtils.formatYMD(new Date(data.getEstablishDate())) : null);
                     userInfoNew.setRecordNumber(data.getRegisterNumber());
                 }
                 // 设置 基金数