u

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

+package com.dsk.web.controller.dsk;
+
+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.JskCombineSearchDto;
+import com.dsk.system.dskService.JskCombineInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 集团户相关信息
+ * @author lcl
+ * @create 2023/8/7
+ */
+@Slf4j
+@RestController
+@RequestMapping(value = "/combine/info")
+public class JskCombineInfoController extends BaseController {
+
+    @Autowired
+    private JskCombineInfoService baseService;
+
+    /**
+     *  集团成员列表
+     */
+    @GetMapping("/memberList")
+    public TableDataInfo memberList(JskCombineSearchDto dto) throws Exception {
+        return baseService.memberList(dto);
+    }
+
+    /**
+     *  分组成员数量
+     */
+    @GetMapping("/group/memberCount")
+    public R groupMemberCount(JskCombineSearchDto dto) {
+        return baseService.groupMemberCount(dto);
+    }
+
+    /**
+     *  集团业绩列表
+     */
+    @GetMapping("/businessList")
+    public TableDataInfo businessList(JskCombineSearchDto dto) throws Exception {
+        return baseService.businessList(dto);
+    }
+}

dsk-admin/src/main/resources/application-test.yml

@@ -194,11 +194,15 @@ xss:
 
 dsk:
   open:
-    endPoint: 120.27.13.145:8865
-    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: http
+#    endPoint: 120.27.13.145:8865
+#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+#    protocol: http
 #    endPoint: openapi.jiansheku.com
 #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
 #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
 #    protocol: https
+    endPoint: localhost:8766
+    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+    protocol: http

dsk-system/src/main/java/com/dsk/system/domain/dsk/dto/JskCombineSearchDto.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 JskCombineSearchDto implements Serializable {
+    /**
+     * 集团id
+     */
+    @NotNull(message = "集团id不能为空！")
+    private String combineId;
+    /**
+     * 筛选参数
+     */
+    private String searchValue;
+    /**
+     * 集团层级
+     */
+    private String combineMemberLevel;
+    /**
+     * 省id
+     */
+    private List<Integer> provinceIds;
+    /**
+     * 市id
+     */
+    private List<Integer> cityIds;
+    /**
+     * 区id
+     */
+    private List<Integer> districtIds;
+    /**
+     * 最大金额
+     */
+    private Integer maxAmount;
+    /**
+     * 最小金额
+     */
+    private Integer minAmount;
+    /**
+     * 业务类型
+     */
+    private String businessType;
+    /**
+     * 科技型企业类型
+     */
+    private List<String> companyTypes;
+    /**
+     * 企业类型
+     */
+    private String companyType;
+    /**
+     * 最大持股比例
+     */
+    private Double maxStockPercent;
+    /**
+     * 最小持股比例
+     */
+    private Double minStockPercent;
+    /**
+     * 中标时间（开始）
+     */
+    private Date startBidTime;
+    /**
+     * 中标时间（结束）
+     */
+    private Date endBidTime;
+    /**
+     * 业绩类型
+     */
+    private List<String> boundTypes;
+    /**
+     * 项目类型
+     */
+    private List<String> projectTypes;
+
+    /**
+     * 页码
+     */
+    private Integer pageNum;
+    /**
+     * 每页条数
+     */
+    private Integer pageSize;
+
+
+}

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

@@ -415,22 +415,34 @@ public class EnterpriseService {
             if (!ObjectUtils.isEmpty(map.get("data"))) {
                 result.put("companyId", MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid"));
             }
-            if (!ObjectUtil.isEmpty(result.get("companyId"))) {
-                R res = this.getUipIdByCid(Collections.singletonList(MapUtils.getInteger(result,"companyId")));
+            result.put("uipId", this.getUipIdByCompanyNameOrCompanyId(companyName, MapUtils.getInteger(result, "companyId")));
+        } catch (Exception e) {
+            log.debug("获取企业id错误！error：{}", e.getMessage());
+        }
+        return result;
+    }
+
+    //企业uipId
+    public String getUipIdByCompanyNameOrCompanyId(String companyName, Integer companyId) {
+        try {
+            String uipId = null;
+            if (!ObjectUtil.isEmpty(companyId)) {
+                R res = this.getUipIdByCid(Collections.singletonList(companyId));
                 if (!ObjectUtils.isEmpty(res.getData())) {
                     List<Map<String, Object>> data = (List<Map<String, Object>>) res.getData();
-                    result.put("uipId", MapUtil.getStr(BeanUtil.beanToMap(data.get((0))), "uipId"));
+                    uipId = MapUtil.getStr(BeanUtil.beanToMap(data.get((0))), "uipId");
                 }
             }
-            if (ObjectUtil.isEmpty(result.get("uipId"))) {
+            if (ObjectUtil.isEmpty(uipId)) {
                 R res = this.getUipId(companyName);
                 if (!ObjectUtils.isEmpty(res.getData())) {
-                    result.put("uipId", MapUtil.getStr(BeanUtil.beanToMap(res.getData()), "uipId"));
+                   uipId = MapUtil.getStr(BeanUtil.beanToMap(res.getData()), "uipId");
                 }
             }
+            return uipId;
         } catch (Exception e) {
-            log.debug("获取企业id错误！error：{}", e.getMessage());
+            log.debug("获取企业uipId错误！error：{}", e.getMessage());
         }
-        return result;
+        return null;
     }
 }

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

+package com.dsk.system.dskService;
+
+import cn.hutool.core.bean.BeanException;
+import cn.hutool.core.bean.BeanUtil;
+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.JskCombineSearchDto;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.ibatis.util.MapUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author lcl
+ * @create 2023/8/7
+ */
+@Slf4j
+@Service
+public class JskCombineInfoService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+    @Autowired
+    private EnterpriseService enterpriseService;
+
+    public TableDataInfo memberList(JskCombineSearchDto dto) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/memberList", BeanUtil.beanToMap(dto, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
+
+
+    public R groupMemberCount(JskCombineSearchDto dto) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/group/memberCount", BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public TableDataInfo businessList(JskCombineSearchDto dto) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/businessList", 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));
+                    Integer projectUnitId = MapUtils.getInteger(res, "projectUnitId");
+                    String projectUnit = MapUtils.getString(res, "projectUnit");
+                    res.put("projectUnitUipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(projectUnit, projectUnitId));
+                });
+            }
+        }
+        return dskOpenApiUtil.responsePage(map);
+    }
+}

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

@@ -83,25 +83,7 @@ public class CustomerServiceImpl implements ICustomerService {
     @Transactional(rollbackFor = Exception.class)
     public boolean add(Customer customer) {
         dealWithcustomerData(customer);
-        if (ObjectUtils.isEmpty(customer.getUipId())) {
-            try {
-                List<Integer> list = new ArrayList<>();
-                list.add(customer.getCompanyId());
-                R res = enterpriseService.getUipIdByCid(list);
-                if (!ObjectUtils.isEmpty(res.getData())) {
-                    List<Map<String, Object>> data = (List<Map<String, Object>>) res.getData();
-                    customer.setUipId(MapUtil.getStr(BeanUtil.beanToMap(data.get((0))), "uipId"));
-                }
-                if (ObjectUtils.isEmpty(customer.getUipId())) {
-                    res = enterpriseService.getUipId(customer.getCompanyName());
-                    if (!ObjectUtils.isEmpty(res.getData())) {
-                        customer.setUipId(MapUtil.getStr(BeanUtil.beanToMap(res.getData()), "uipId"));
-                    }
-                }
-            } catch (Exception e) {
-                log.error("获取城投平台企业id错误！error：{}", e.getMessage());
-            }
-        }
+        customer.setUipId(enterpriseService.getUipIdByCompanyNameOrCompanyId(customer.getCompanyName(), customer.getCompanyId()));
         Long userId = SecurityUtils.getUserId();
         customer.setCreateId(userId);
         customer.setUpdateId(userId);