单位类型

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitPersonController.java

@@ -32,9 +32,9 @@ public class BmUnitPersonController extends BaseController
     private IBmUnitPersonService bmUnitPersonService;
 
     /**
-     * 查询往来单位管理列表
+     * 查询往来单位绑定管理列表
      */
-    @ApiOperation(value = "查询往来单位管理列表")
+    @ApiOperation(value = "查询往来单位绑定管理列表")
     @RequiresPermissions("basic:person:list")
     @GetMapping("/list")
     public TableDataInfo list(BmUnitPerson bmUnitPerson)

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitPersonServiceImpl.java

@@ -2,17 +2,23 @@ package com.bonus.material.basic.service.impl;
 
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.bonus.common.biz.enums.HttpCodeEnum;
+import com.bonus.common.core.constant.SecurityConstants;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.material.basic.domain.BmUnit;
 import com.bonus.material.basic.mapper.BmUnitMapper;
 import com.bonus.material.purchase.config.RemoteConfig;
+import com.bonus.system.api.RemoteDeptService;
+import com.bonus.system.api.domain.SysDept;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Service;
 import com.bonus.material.basic.mapper.BmUnitPersonMapper;
 import com.bonus.material.basic.domain.BmUnitPerson;
 import com.bonus.material.basic.service.IBmUnitPersonService;
 
 import javax.annotation.Resource;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -34,6 +40,9 @@ public class BmUnitPersonServiceImpl implements IBmUnitPersonService
     @Resource
     private BmUnitMapper bmUnitMapper;
 
+    @Resource
+    private RemoteDeptService remoteDeptService;
+
     /**
      * 新增往来单位管理
      * 
@@ -109,8 +118,36 @@ public class BmUnitPersonServiceImpl implements IBmUnitPersonService
                     //根据单位id去人员绑定中查询是否绑定，赋值绑定状态
                     item.setIsBind(bmUnitMapper.selectBmUnitPersonByUnitId(item.getUnitId()) > 0 ? 1 : 0);
                 }
+                extracted(item);
             });
         }
         return bmUnitList;
     }
+
+    /**
+     * 方法抽取
+     * @param unit
+     */
+    private void extracted(BmUnit unit) {
+        Map<String, String> labelMap = remoteConfig.getDictValue("bm_unit_type");
+        if (unit.getUnitId() != null) {
+            //根据单位id去人员绑定中查询是否绑定，赋值绑定状态
+            unit.setIsBind(bmUnitMapper.selectBmUnitPersonByUnitId(unit.getUnitId()) > 0 ? 1 : 0);
+        }
+        if (unit.getTypeId() != null) {
+            unit.setTypeName(labelMap.get(unit.getTypeId().toString()) == null ? "" : labelMap.get(unit.getTypeId().toString()));
+        }
+        AjaxResult ajaxResult = remoteDeptService.getInfo(unit.getDeptId(), SecurityConstants.INNER);
+        //健壮性判断
+        if (ajaxResult.isSuccess()) {
+            // ajaxResult.get("data") 返回的是 LinkedHashMap
+            LinkedHashMap rawDataList = (LinkedHashMap) ajaxResult.get("data");
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            if (rawDataList != null) {
+                SysDept sysDept = objectMapper.convertValue(rawDataList, SysDept.class);
+                unit.setDeptName(sysDept.getDeptName() == null ? "" : sysDept.getDeptName());
+            }
+        }
+    }
 }