专家库专家类型

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

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.base.domain.BaseExpert;
+import com.ozs.base.domain.BaseProfessional;
 import com.ozs.base.domain.vo.BaseExpertVo;
 import com.ozs.base.domain.vo.BaseProfessionalVo;
 import com.ozs.base.service.BaseExpertService;
+import com.ozs.base.service.BaseProfessionalService;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.core.controller.BaseController;
@@ -45,6 +47,8 @@ public class BaseExpertController extends BaseController {
     private BaseExpertService baseExpertService;
     @Autowired
     private SysRegionService sysRegionService;
+    @Autowired
+    private BaseProfessionalService baseProfessionalService;
 
     @ApiOperation(value = "新增专家库", notes = "必传 专家库名称")
     @PostMapping("/insertExpert")
@@ -103,15 +107,22 @@ public class BaseExpertController extends BaseController {
         }
         lw.orderBy(true, false, BaseExpert::getCreateTime);
         List<BaseExpert> list = baseExpertService.list(lw);
-        // IPage<BaseExpert> page = baseExpertService.page(new Page<BaseExpert>(baseExpertVo.getPageNum(), baseExpertVo.getPageSize()), lw);
-        // List<BaseExpert> records = page.getRecords();
-        // 把 localArea 翻译为 省/市/县，存localAreaName中，(使用SysRegionService的getParentAdministrativeDivisionNames方法)
         List<BaseExpertVo> listVo = BeanUtils.entityListToVOList(list, BaseExpertVo.class);
         for (BaseExpertVo vo : listVo) {
+            // 区域
             if (StringUtils.isNotNull(vo.getLocalArea())) {
                 String parentAdministrativeDivisionNames = sysRegionService.getParentAdministrativeDivisionNames(vo.getLocalArea());
                 vo.setLocalAreaName(parentAdministrativeDivisionNames);
             }
+            // 专业类型
+            if (!org.apache.commons.lang3.StringUtils.isBlank(vo.getMajorType())) {
+                LambdaQueryWrapper<BaseProfessional> lwe = new LambdaQueryWrapper<>();
+                lwe.eq(BaseProfessional::getId, Integer.parseInt(vo.getMajorType()));
+                List<BaseProfessional> list1 = baseProfessionalService.list(lwe);
+                if (!ObjectUtils.isEmpty(list1)) {
+                    vo.setMajorTypeName(list1.get(0).getProfessionalName());
+                }
+            }
         }
         Page pages = PageUtils.getPages(baseExpertVo.getPageNum().intValue(), baseExpertVo.getPageSize().intValue(), listVo);
         return success(pages);