Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java

@@ -91,29 +91,27 @@ public class BusinessOpportunityRadarService {
         }
 
         ArrayList<String> companyNames = new ArrayList<>();
-        ArrayList<Long> cIds = new ArrayList<>();
         for (Object dataMap : list) {
-            String name = MapUtils.getString(CommonUtils.assertAsMap(dataMap), "companyName");
+            String name = MapUtils.getString(CommonUtils.assertAsMap(dataMap), "name");
             if (ObjectUtil.isNotEmpty(name) && name.contains("font")) {
-                name = name.replaceAll("<font color='red'>", "");
+                name = name.replaceAll("<font color='#FF204E'>", "");
                 name = name.replaceAll("</font>", "");
                 companyNames.add(name);
             } else {
                 companyNames.add(name);
             }
-            cIds.add(MapUtils.getLong(CommonUtils.assertAsMap(dataMap), "companyId"));
         }
 
         List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusListByCompanyName(companyNames);
 
         for (Object enterprise : list) {
             Map<String, Object> companyMap = CommonUtils.assertAsMap(enterprise);
-            String companyName = MapUtils.getString(companyMap, "companyName", "");
+            String companyName = MapUtils.getString(companyMap, "name", "");
             if (ObjectUtil.isNotEmpty(companyName) && companyName.contains("font")) {
-                companyName = companyName.replace("<font color='red'>", "");
+                companyName = companyName.replace("<font color='#FF204E'>", "");
                 companyName = companyName.replace("</font>", "");
             }
-            companyMap.put("claimStatus", null);
+            companyMap.put("claimStatus", 0);
             for (CustomerStatusListVo vo : claimStatusList) {
                 if (companyName.equals(vo.getCompanyName())) {
                     companyMap.put("claimStatus", vo.getStatus());

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/MarketAnalysisService.java

@@ -127,8 +127,8 @@ public class MarketAnalysisService {
         if (!ObjectUtils.isEmpty(map.get("data"))) {
             List<Map<String, Object>> list = (List<Map<String, Object>>) map.get("data");
             list.parallelStream().forEach(res -> {
-                Integer companyId = MapUtils.getInteger(res, "companyId");
-                String companyName = MapUtils.getString(res, "companyName");
+                Integer companyId = MapUtils.getInteger(res, "tendereeId");
+                String companyName = MapUtils.getString(res, "tenderee");
                 res.put("uipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(companyName, companyId));
             });
         }
@@ -140,8 +140,8 @@ public class MarketAnalysisService {
         if (!ObjectUtils.isEmpty(map.get("data"))) {
             List<Map<String, Object>> list = (List<Map<String, Object>>) map.get("data");
             list.parallelStream().forEach(res -> {
-                Integer companyId = MapUtils.getInteger(res, "tendereeId");
-                String companyName = MapUtils.getString(res, "tenderee");
+                Integer companyId = MapUtils.getInteger(res, "companyId");
+                String companyName = MapUtils.getString(res, "companyName");
                 res.put("uipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(companyName, companyId));
             });
         }