大屏人员详情资质字典值处理

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/UserBizByTCMServiceImpl.java

@@ -7,6 +7,7 @@ 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.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
 import com.yeejoin.amos.boot.module.statistics.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.UserInfoMapper;
@@ -15,13 +16,15 @@ import com.yeejoin.amos.boot.module.statistics.api.vo.TzsUserInfoVo;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -56,6 +59,9 @@ public class UserBizByTCMServiceImpl {
     private UserInfoMapper tzsUserInfoMapper;
     @Autowired
     private UserPermissionMapper tzsUserPermissionMapper;
+    @Autowired
+    private DataDictionaryServiceImpl dictionaryService;
+
     public Map<String, Object> getDetail(Long id) {
         Map<String, Object> maps = new HashMap<>();
         TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(id);
@@ -146,6 +152,33 @@ public class UserBizByTCMServiceImpl {
         // 作业项目【jobItem】 字段特殊处理
         JSONArray jobItem = JSON.parseArray(String.valueOf(json.get("jobItem")));
         json.put("jobItem", jobItem);
+
+        // 处理检验、检测资质级别、项目字典code->名称
+        if (JYRY_TYPE.equals(permission.getPermissionPost()) || JCRY_TYPE.equals(permission.getPermissionPost())) {
+            List<DictionarieValueModel> dataDictionaryList = Systemctl.dictionarieClient.dictValues("RYJB_JYJC").getResult();
+            String permissionLevel = String.valueOf(json.get("permissionLevel"));
+            List<DictionarieValueModel> itemDictionaryList = Systemctl.dictionarieClient.dictValues("ZZXM_" + permissionLevel).getResult();
+            if (!ValidationUtil.isEmpty(dataDictionaryList)) {
+                dataDictionaryList.forEach(item -> {
+                    if (item.getDictDataKey().equals(permissionLevel)) {
+                        json.put("permissionLevel", item.getDictDataValue());
+                    }
+                });
+            }
+
+            JSONArray permissionItem = JSON.parseArray(String.valueOf(json.get("permissionItem")));
+            JSONArray permissionItemName = new JSONArray();
+            if (!ValidationUtil.isEmpty(permissionItem)) {
+                if (!ValidationUtil.isEmpty(itemDictionaryList)) {
+                    for (Object item : permissionItem) {
+                        String finalItem = item.toString();
+                        item = itemDictionaryList.stream().filter(dict -> dict.getDictDataKey().equals(finalItem)).findFirst().map(DictionarieValueModel::getDictDataValue).orElse(finalItem);
+                        permissionItemName.add(item);
+                    }
+                }
+                json.put("permissionItem", permissionItemName);
+            }
+        }
         return json;
     }
 }