Merge branch 'master' of 192.168.60.201:root/dsk-operate-sys

                                                                                                      # Conflicts:
                                                                                                      #	dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java
集团户

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

 package com.dsk.web.controller.dsk;
 
+import com.alibaba.fastjson2.JSONObject;
 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;
@@ -72,4 +74,36 @@ public class JskCombineInfoController extends BaseController {
     public R groupCertificateCount(@RequestBody JskCombineSearchDto dto) throws Exception {
         return baseService.groupCertificateCount(dto);
     }
+
+    /**
+     *  集团户搜索
+     */
+    @PostMapping("/index")
+    public AjaxResult index(@RequestBody JSONObject object) {
+        return baseService.index(object);
+    }
+
+    /**
+     *  查央企
+     */
+    @PostMapping("/centralEnterprse")
+    public AjaxResult centralEnterprse()  {
+        return baseService.centralEnterprse();
+    }
+
+    /**
+     *  查央企子公司
+     */
+    @PostMapping("/centralEnterprse/child")
+    public AjaxResult centralEnterprseChild() {
+        return baseService.centralEnterprseChild();
+    }
+
+    /**
+     *  查地方国企
+     */
+    @PostMapping("/centralEnterprse/local")
+    public AjaxResult centralEnterprseLocal(@RequestBody JSONObject object)  {
+        return baseService.centralEnterprseLocal(object);
+    }
 }

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

@@ -3,6 +3,8 @@ 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.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
@@ -88,4 +90,24 @@ public class JskCombineInfoService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/group/certificateCount", BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, R.class);
     }
+
+    public AjaxResult index(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/groupCompany", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult centralEnterprse() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult centralEnterprseChild() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/child", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult centralEnterprseLocal(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/local", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }