【DAOP-1.0】服务商

【功能点】联调问题处理

@@ -87,6 +87,9 @@ public class ServicerMaintainRSVO {
     
     
     /******** 自定义扩展 *****/
     /******** 自定义扩展 *****/
 
 
+    @Schema(description = "企业类型名称")
+    private String tenantTypeName;
+    
     /**
     /**
      * 审批信息
      * 审批信息
      */
      */

@@ -3,8 +3,10 @@ package com.csbr.qingcloud.portal.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 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.entity.DictModel;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.SystemError;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
+import com.csbr.qingcloud.portal.feign.ConfigureFeign;
 import com.csbr.qingcloud.portal.mybatis.entity.MfServicerMaintainDetail;
 import com.csbr.qingcloud.portal.mybatis.entity.MfServicerMaintainDetail;
 import com.csbr.qingcloud.portal.mybatis.service.MfServicerMaintainDetailService;
 import com.csbr.qingcloud.portal.mybatis.service.MfServicerMaintainDetailService;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
@@ -71,6 +73,9 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
     @Resource
     @Resource
     private MessageSourceUtil messageSourceUtil;
     private MessageSourceUtil messageSourceUtil;
 
 
+    @Resource
+    private ConfigureFeign configureFeign;
+
     /**
     /**
      * 服务商维护分页查询
      * 服务商维护分页查询
      * @author xcq
      * @author xcq
@@ -530,9 +535,31 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
         ServicerMaintainRSVO vo = csbrBeanUtil.convert(entity, ServicerMaintainRSVO.class);
         ServicerMaintainRSVO vo = csbrBeanUtil.convert(entity, ServicerMaintainRSVO.class);
         //流程数据处理
         //流程数据处理
         vo.setApproveVO(approvalFlowUtil.getApprovalInfo(entity.getGuid()));
         vo.setApproveVO(approvalFlowUtil.getApprovalInfo(entity.getGuid()));
+        vo.setTenantTypeName(getTypeName(entity.getTenantType()));
         return vo;
         return vo;
     }
     }
 
 
+    private List<DictModel> dicList = new ArrayList<>();
+
+    private String getTypeName(String tenantType) {
+        if (CollectionUtils.isEmpty(dicList)) {
+            dicList = configureFeign.getDictListByType("客户类型").getData();
+        }
+        for(DictModel item : dicList){
+            if(item.getValue().equals(tenantType)){
+                return item.getText();
+            }
+            if(CollectionUtils.isNotEmpty(item.getChildDictList())){
+                for(DictModel child : item.getChildDictList()){
+                    if(child.getValue().equals(tenantType)){
+                        return child.getText();
+                    }
+                }
+            }
+        }
+        return tenantType;
+    }
+
     /**
     /**
      * 服务商维护新增、修改和其他情况的参数转换为实体
      * 服务商维护新增、修改和其他情况的参数转换为实体
      * @author xcq
      * @author xcq