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

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java

@@ -192,6 +192,36 @@ public class EnterpriseBussinessService {
             return new TableDataInfo(new ArrayList<>(), 0);
         }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage2", BeanUtil.beanToMap(body, false, false));
+        Map data = MapUtils.getMap(map, "data", null);
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+        if (CollectionUtils.isEmpty(list)) {
+            return new TableDataInfo(list, 0);
+        }
+
+        ArrayList<Long> cIds = new ArrayList<>();
+        for (Object dataMap : list) {
+            cIds.add(MapUtils.getLong(CommonUtils.assertAsMap(dataMap), "companyId"));
+        }
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("ids", cIds);
+        Map<String, Object> uipIdMap = dskOpenApiUtil.requestBody("/operate/enterprise/getUipIdByCid", paramMap);
+        Object uipIdData = uipIdMap.get("data");
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(uipIdData)) {
+            mapList = (List<Map<String, Object>>)uipIdData;
+        }
+        for (Object dataMap : list) {
+            Map<String, Object> companyMap = CommonUtils.assertAsMap(dataMap);
+            Long cusCompanyId = MapUtils.getLong(companyMap, "companyId", 0L);
+            companyMap.put("uipId", null);
+            for (Map<String, Object> m : mapList) {
+                String uipId = MapUtils.getString(m, "uipId", null);
+                Long companyId = MapUtils.getLong(m, "companyId", 0L);
+                if (cusCompanyId.equals(companyId)) {
+                    companyMap.put("uipId", uipId);
+                }
+            }
+        }
         return dskOpenApiUtil.responsePage(map);
     }
 

dsk-system/src/main/java/com/dsk/system/dskService/JskCombineInfoService.java

@@ -60,7 +60,7 @@ public class JskCombineInfoService {
     }
 
     public TableDataInfo businessList(JskCombineSearchDto dto) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/businessList", BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/combine/projectList", BeanUtil.beanToMap(dto, false, false));
         if (!ObjectUtils.isEmpty(map.get("data"))) {
             Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
             if (!ObjectUtils.isEmpty(data.get("list"))) {
@@ -148,7 +148,7 @@ public class JskCombineInfoService {
         if (ObjectUtils.isEmpty(dto.getPageSize())) throw new ServiceException("导出条数不能为空！");
         if (dto.getPageSize() > 2000) dto.setPageSize(2000);
 
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/businessList", BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/combine/projectList", BeanUtil.beanToMap(dto, false, false));
         if (ObjectUtils.isEmpty(map.get("data"))) throw new ServiceException("导出失败，系统错误！");
         Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
         if (ObjectUtils.isEmpty(data.get("list"))) throw new ServiceException("导出失败，系统错误！");