专家库 专家类型 名称传唤

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseExpertController.java

@@ -17,6 +17,7 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
+import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.SysRegionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -30,8 +31,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.constraints.NotEmpty;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 专家库管理
@@ -49,6 +52,8 @@ public class BaseExpertController extends BaseController {
     private SysRegionService sysRegionService;
     @Autowired
     private BaseProfessionalService baseProfessionalService;
+    @Autowired
+    private ISysDictDataService dictDataService;
 
     @ApiOperation(value = "新增专家库", notes = "必传 专家库名称")
     @PostMapping("/insertExpert")
@@ -123,6 +128,17 @@ public class BaseExpertController extends BaseController {
                     vo.setMajorTypeName(list1.get(0).getProfessionalName());
                 }
             }
+            // 专家类型
+            if (StringUtils.isNotEmpty(vo.getExpertType())) {
+                String expertType = vo.getExpertType();
+                List<String> expertTypeList = Arrays.stream(expertType.split(",")).map(s -> s.trim()).collect(Collectors.toList());
+                for (String eT : expertTypeList) {
+                    String expertTypeName = dictDataService.selectDictLabel("expert_type", eT);
+                    if (StringUtils.isNotEmpty(expertTypeName)) {
+                        vo.setExpertTypeName(expertTypeName);
+                    }
+                }
+            }
         }
         Page pages = PageUtils.getPages(baseExpertVo.getPageNum().intValue(), baseExpertVo.getPageSize().intValue(), listVo);
         return success(pages);