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/BusinessOpportunityRadarController.java

@@ -85,6 +85,18 @@ public class BusinessOpportunityRadarController {
         return opportunityRadarService.jskBidNewsPage(object);
     }
 
+    /*
+     * 标讯pro   商机项目关联查询
+     */
+    @RequestMapping("/jskBidNewsPage/findByName")
+    public AjaxResult findByName(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.findByName(object);
+    }
+
 
     /*
      * 专项债查询

dsk-system/src/main/java/com/dsk/system/searchService/BusinessOpportunityRadarService.java

@@ -26,6 +26,11 @@ public class BusinessOpportunityRadarService {
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
+    public AjaxResult findByName(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/findByName", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
     public AjaxResult jskBidTenderPage(JSONObject object) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidTender/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);