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

@@ -25,6 +25,14 @@ public class BusinessOpportunityRadarController {
     @Resource
     BusinessOpportunityRadarService opportunityRadarService;
 
+    /*
+     * 公招标讯
+     */
+    @RequestMapping("/jskBidPage")
+    public AjaxResult jskBidPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidPage(compose);
+    }
+
     /*
      * 土地交易
      */

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

@@ -15,7 +15,10 @@ public interface BusinessOpportunityRadarService {
     AjaxResult jskBidNewsPage(ComposeQueryDto compose);
     AjaxResult jskBidTenderPage(ComposeQueryDto compose);
 
+    AjaxResult jskBidPage(ComposeQueryDto compose);
+
     AjaxResult landMarketPage(ComposeQueryDto compose);
+
     AjaxResult establishmentPage(ComposeQueryDto compose);
 
     AjaxResult enterpriseIndex(ComposeQueryDto compose);

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

@@ -44,6 +44,12 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
+    @Override
+    public AjaxResult jskBidPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
     @Override
     public AjaxResult landMarketPage(ComposeQueryDto compose) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/landMarket/page", BeanUtil.beanToMap(compose, false, false));