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/search/controller/CompanySearchController.java

@@ -26,7 +26,7 @@ public class CompanySearchController {
      */
     @RequestMapping("/index")
     public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.enterprisePage(compose);
+        return opportunityRadarService.enterpriseIndex(compose);
     }
 
     /*
@@ -36,4 +36,12 @@ public class CompanySearchController {
     public AjaxResult findByName(@PathVariable String keyword) {
         return opportunityRadarService.enterpriseByName(keyword);
     }
+
+    /*
+     * 完全匹配企业名称
+     */
+    @GetMapping("/page")
+    public AjaxResult page(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.enterprisePage(compose);
+    }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

@@ -18,10 +18,12 @@ public interface BusinessOpportunityRadarService {
     AjaxResult landMarketPage(ComposeQueryDto compose);
     AjaxResult establishmentPage(ComposeQueryDto compose);
 
-    AjaxResult enterprisePage(ComposeQueryDto compose);
+    AjaxResult enterpriseIndex(ComposeQueryDto compose);
 
     AjaxResult enterpriseByName(String keyword);
 
+    AjaxResult enterprisePage(ComposeQueryDto compose);
+
     AjaxResult bondProjectPage(ComposeQueryDto compose);
 
     AjaxResult jskBidPlanPage(ComposeQueryDto compose);

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

@@ -51,11 +51,18 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
     }
 
     @Override
-    public AjaxResult enterprisePage(ComposeQueryDto compose) {
+    public AjaxResult enterpriseIndex(ComposeQueryDto compose) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
+    @Override
+    public AjaxResult enterprisePage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
     @Override
     public AjaxResult enterpriseByName(String keyword){
         Map<String,Object> params = new HashMap<>();