feat: 服务商任务评分数据以及企查查评分数据汇总 update

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysStatisticManager.java

@@ -668,14 +668,29 @@ public class SysStatisticManager {
         List<Map<String, Object>> collect = depts.stream().map(d -> {
             Map<String, Object> map = new HashMap<>(6);
 
+            // 企业ID
             map.put("id", d.getDeptId());
+            // 服务商名称
             map.put("providerName", d.getName());
-            map.put("areaCodes", detpId2AreaCodesMap.get((long) d.getDeptId()));
-
+            // 区域（只显示省份）
+            List<Long> areaCodes = detpId2AreaCodesMap.get((long) d.getDeptId());
+            List<String> provinceNames = CollUtil.isEmpty(areaCodes)
+                    ? Collections.emptyList()
+                    : areaEntityService.list(Wrappers.<SysAreaEntity>lambdaQuery()
+                            .in(SysAreaEntity::getAreaType, UpmsType.AreaType.PROVINCE)
+                            .in(SysAreaEntity::getAreaId, areaCodes))
+                    .stream()
+                    .map(SysAreaEntity::getAreaName)
+                    .distinct()
+                    .collect(Collectors.toList());
+            ;
+
+            map.put("areaCodes", provinceNames);
+            // 服务产品
             List<String> drugNames = drugMap.get(d.getDeptId());
-
             map.put("products", drugNames);
 
+            // 企查查评分
             Map<String, Object> creditRatingReportGrade;
             if (StrUtil.isNotBlank(d.getTaxCode())) {
                 List<WmQccInfo> wmQccInfos = qccInfo.get(d.getTaxCode());
@@ -690,11 +705,9 @@ public class SysStatisticManager {
 
             map.put("qccScore", creditRatingReportGrade);
 
+            // 服务商评分
             List<WmAgentEvaluation> agentEvaluations = dept2EvalMap.get(d.getDeptId());
-
-
             map.put("serviceMark", CollUtil.isNotEmpty(agentEvaluations) ? agentEvaluations.get(0) : null);
-            // map.put("average", 123);
 
             return map;
         }).collect(Collectors.toList());