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

@@ -99,6 +99,14 @@ public class JskCombineInfoController extends BaseController {
         return baseService.centralEnterprseChild();
     }
 
+    /**
+     *  查央企子公司
+     */
+    @PostMapping("/centralEnterprse/child/page")
+    public AjaxResult centralEnterprseChildPage(@RequestBody JSONObject object) {
+        return baseService.centralEnterprseChildPage(object);
+    }
+
     /**
      *  查地方国企
      */
@@ -106,4 +114,20 @@ public class JskCombineInfoController extends BaseController {
     public AjaxResult centralEnterprseLocal(@RequestBody JSONObject object)  {
         return baseService.centralEnterprseLocal(object);
     }
+
+    /**
+     *  民营企业
+     */
+    @PostMapping("/centralEnterprse/social")
+    public AjaxResult centralEnterprseSocial()  {
+        return baseService.centralEnterprseSocial();
+    }
+
+    /**
+     *  民营企业
+     */
+    @PostMapping("/centralEnterprse/social/page")
+    public AjaxResult centralEnterprseSocialPage(@RequestBody JSONObject object)  {
+        return baseService.centralEnterprseSocialPage(object);
+    }
 }

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

@@ -106,8 +106,23 @@ public class JskCombineInfoService {
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
+    public AjaxResult centralEnterprseChildPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/child/page", object);
+        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);
     }
+
+    public AjaxResult centralEnterprseSocial() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/social", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult centralEnterprseSocialPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/social/page", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }