u

dsk-admin/src/main/java/com/dsk/web/controller/dsk/JskCombineInfoController.java

@@ -4,6 +4,7 @@ import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.system.domain.dsk.dto.JskCombineCertificateDto;
 import com.dsk.system.domain.dsk.dto.JskCombineSearchDto;
 import com.dsk.system.dskService.JskCombineInfoService;
 import lombok.extern.slf4j.Slf4j;
@@ -48,4 +49,19 @@ public class JskCombineInfoController extends BaseController {
     public TableDataInfo businessList(JskCombineSearchDto dto) throws Exception {
         return baseService.businessList(dto);
     }
+
+    /**
+     *  集团资质列表
+     */
+    @GetMapping("/certificateList")
+    public TableDataInfo certificateList(JskCombineSearchDto dto) throws Exception {
+        return baseService.certificateList(dto);
+    }
+    /**
+     *  集团成员资质列表
+     */
+    @GetMapping("/menber/certificateList")
+    public TableDataInfo menberCertificateList(JskCombineCertificateDto dto) throws Exception {
+        return baseService.menberCertificateList(dto);
+    }
 }

dsk-system/src/main/java/com/dsk/system/domain/dsk/dto/JskCombineCertificateDto.java

+package com.dsk.system.domain.dsk.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 集团户相关查询条件实体类
+ *
+ * @author lcl
+ * @create 2023/8/7
+ */
+@Data
+public class JskCombineCertificateDto implements Serializable {
+    /**
+     * 数据id
+     */
+    @NotNull(message = "id不能为空！")
+    private Long id;
+
+    /**
+     * 页码
+     */
+    private Integer pageNum;
+    /**
+     * 每页条数
+     */
+    private Integer pageSize;
+
+
+}

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.domain.dsk.dto.JskCombineCertificateDto;
 import com.dsk.system.domain.dsk.dto.JskCombineSearchDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
@@ -14,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -59,4 +62,25 @@ public class JskCombineInfoService {
         }
         return dskOpenApiUtil.responsePage(map);
     }
+
+    public TableDataInfo certificateList(JskCombineSearchDto dto) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/certificateList", BeanUtil.beanToMap(dto, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+    public TableDataInfo menberCertificateList(JskCombineCertificateDto dto)throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/member/certificateList", 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"))) {
+                List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+                list.parallelStream().forEach(res -> {
+                    Integer companyId = MapUtils.getInteger(res, "companyId");
+                    String companyName = MapUtils.getString(res, "companyName");
+                    res.put("uipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(companyName, companyId));
+                });
+            }
+        }
+        return dskOpenApiUtil.responsePage(map);
+    }
 }