fix(jg-安全追溯-问题列表):1，检索条件修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/SafetyProblemTracingServiceImpl.java

@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.jg.api.entity.SafetyProblemTracing;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemSourceTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemStatusEnum;
@@ -26,14 +28,14 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.ValidationUtils;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static org.springframework.jdbc.object.BatchSqlUpdate.DEFAULT_BATCH_SIZE;
 
@@ -48,6 +50,8 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
 
     @Autowired
     IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
 
     private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
     @Autowired
@@ -68,6 +72,15 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
         problemModel.setGoverningBodyOrgCode(orgCode);
         // 使用orgCode过滤
         problemModel.setRegionCode(null);
+        // 将单位类型从code转化为value
+        if (!ValidationUtil.isEmpty(problemModel.getPrincipalUnitType())){
+            Collection<DataDictionary> unitTypeList = iDataDictionaryService.list(new QueryWrapper<DataDictionary>()
+                    .eq("type", "UNIT_TYPE_NEW")
+                    .eq("is_delete", false)
+                    .orderByAsc("sort_num"));
+            Map<String, String> unitTypeMap = unitTypeList.stream().collect(Collectors.toMap(DataDictionary::getCode, DataDictionary::getName));
+            problemModel.setPrincipalUnitType(unitTypeMap.getOrDefault(problemModel.getPrincipalUnitType(),null));
+        }
         return this.baseMapper.queryForSafetyProblemTracingPage(page, problemModel);
     }