【DAOP-1.0】企业认证

【功能点】测试问题处理

+package com.csbr.qingcloud.portal.domain.vo;
+
+import csbr.cloud.entity.domain.base.vo.CsbrBaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+* 企业证照表 视图对象类
+*
+* @author xiaocq
+* @date 2023-12-19
+*/
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@Schema(name = "企业证照表")
+public class TenantLicRQVO extends CsbrBaseVO {
+    /**
+    * 企业唯一标识
+    */
+    @Schema(description = "企业唯一标识")
+    private String tenantGuid;
+
+    /**
+    * 证照类型
+    */
+    @Schema(description = "证照类型")
+    private String licenseType;
+
+    /**
+    * 图片内容
+    */
+    @Schema(description = "图片内容")
+    private String pictContentJson;
+
+
+    /********非库表存储属性*****/
+
+
+
+    /********字典类*****/
+
+    /********实体类、用户单选、组织机构单选*****/
+
+    /********范围查询*****/
+
+    /********自定义扩展*****/
+
+    /********子对象*****/
+
+
+
+
+}

@@ -167,6 +167,9 @@ public class TenantRQVO extends CsbrBaseVO {
 
 
     /********子对象*****/
     /********子对象*****/
 
 
+    @Schema(description = "企业证照列表")
+    private List<TenantLicRQVO> tenantLicList;
+
     @Schema(hidden = true,description = "分库标识")
     @Schema(hidden = true,description = "分库标识")
     private String shardingFlag;
     private String shardingFlag;
 }
 }

 package com.csbr.qingcloud.portal.service.impl;
 package com.csbr.qingcloud.portal.service.impl;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.SystemError;
@@ -30,9 +32,7 @@ import com.csbr.qingcloud.portal.service.EnterpriseService;
 import com.csbr.qingcloud.portal.util.ChangeInfoUtil;
 import com.csbr.qingcloud.portal.util.ChangeInfoUtil;
 import com.csbr.qingcloud.portal.util.DateUtil;
 import com.csbr.qingcloud.portal.util.DateUtil;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
-import csbr.cloud.entity.domain.user.UserInfo;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
-import csbr.cloud.entity.utils.UserContextHolder;
 import io.seata.spring.annotation.GlobalTransactional;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.annotation.Resource;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -41,9 +41,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.List;
-import java.util.Map;
 
 
 /**
 /**
  * @program: D:/git/ms-data-circulation-portal-service
  * @program: D:/git/ms-data-circulation-portal-service
@@ -82,9 +80,6 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
     private MfDemandService mfDemandService;
     private MfDemandService mfDemandService;
 
 
     @Resource
     @Resource
-    private UserFeign userFeign;
-
-    @Resource
     private ConfigureFeign configureFeign;
     private ConfigureFeign configureFeign;
 
 
     /**
     /**
@@ -332,6 +327,17 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
                 vo.setBizGuid(dto.getBizGuid());
                 vo.setBizGuid(dto.getBizGuid());
                 vo.setPersonIncharge(entity.getJuridicalPerson());
                 vo.setPersonIncharge(entity.getJuridicalPerson());
                 vo.setBizState("Y");
                 vo.setBizState("Y");
+                vo.setRegistrationDate(DateUtil.getDateToLocal(entity.getRegistrationDate()));
+                vo.setProvince(entity.getProvince());
+                vo.setCity(entity.getCity());
+                vo.setDistrict(entity.getDistrict());
+                vo.setCompanyAddress(String.format("%s/%s/%s",vo.getProvince(),vo.getCity(),vo.getDistrict()));
+                if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){
+                    ChangeInfoUtil.areaList = configureFeign.getBoroughCodeName().getData();
+                }
+                vo.setVenue(ChangeInfoUtil.getVenue(vo.getProvince(),vo.getCity(),vo.getDistrict()));
+                vo.setTenantLicList(getTenantLicList(entity.getBusinessLicenseJson()));
+
                 personelFeign.authTenant(vo).getData();
                 personelFeign.authTenant(vo).getData();
             }
             }
             else{
             else{
@@ -341,6 +347,33 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
 
 
     }
     }
 
 
+    private List<TenantLicRQVO> getTenantLicList(String json) {
+        if(StringUtils.isBlank(json)){
+            return null;
+        }
+        JSONArray array = JSON.parseArray(json);
+        if(array.size() == 0){
+            return null;
+        }
+        List<TenantLicRQVO> list = new ArrayList<>();
+        for(int i = 0; i < array.size(); i++){
+            JSONObject obj = array.getJSONObject(i);
+            TenantLicRQVO item = new TenantLicRQVO();
+            item.setLicenseType("1");
+
+            //格式转换
+            JSONObject itemOjb = new JSONObject();
+            JSONArray itemArray = new JSONArray();
+            itemOjb.put("name",obj.get("name"));
+            itemOjb.put("path",obj.get("url"));
+            itemArray.add(itemOjb);
+            item.setPictContentJson(JSON.toJSONString(itemArray));
+
+            list.add(item);
+        }
+        return list;
+    }
+
     /** 将此账号提交的数据需求迁移到新的企业 */
     /** 将此账号提交的数据需求迁移到新的企业 */
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)