Commit a21a25a7 authored by liuChang's avatar liuChang

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
中标市场分析
parent 9d501ea4
...@@ -55,8 +55,6 @@ public class MarketAnalysisController extends BaseController { ...@@ -55,8 +55,6 @@ public class MarketAnalysisController extends BaseController {
return marketAnalysisService.certGroupByMajorProvinceLevel(); return marketAnalysisService.certGroupByMajorProvinceLevel();
} }
/* /*
* 产业结构-按年份选择 各个项目类型项目总数 * 产业结构-按年份选择 各个项目类型项目总数
*/ */
...@@ -72,6 +70,14 @@ public class MarketAnalysisController extends BaseController { ...@@ -72,6 +70,14 @@ public class MarketAnalysisController extends BaseController {
return marketAnalysisService.bidMoneyGroupByProjectType(object); return marketAnalysisService.bidMoneyGroupByProjectType(object);
} }
//-----------------------------------中标----------------------------------
//全攻中标项目统计
@RequestMapping("/countBidByType")
public AjaxResult countBidByType(@RequestBody JSONObject object) {
return marketAnalysisService.countBidByType( object);
}
/* /*
* 全国各地区中标统计TOP10 * 全国各地区中标统计TOP10
*/ */
...@@ -80,7 +86,32 @@ public class MarketAnalysisController extends BaseController { ...@@ -80,7 +86,32 @@ public class MarketAnalysisController extends BaseController {
return marketAnalysisService.countBidGroupByProvince(object); return marketAnalysisService.countBidGroupByProvince(object);
} }
//全国中标金额分析
@RequestMapping("/rangeBidMoney")
public AjaxResult rangeBidMoney(@RequestBody JSONObject object) {
return marketAnalysisService.rangeBidMoney( object);
}
//全国中标趋势分析
@RequestMapping("/rangeBidFiveYears")
public AjaxResult rangeBidFiveYears() {
return marketAnalysisService.rangeBidFiveYears();
}
//全国中标下浮率分析
@RequestMapping("/lowerRateByYear")
public AjaxResult lowerRateByYear(@RequestBody JSONObject object) {
return marketAnalysisService.lowerRateByYear( object);
}
//全国中标业绩项目类型下浮率
@RequestMapping("/lowerRangeTenderType")
public AjaxResult lowerRangeTenderType(@RequestBody JSONObject object) {
return marketAnalysisService.lowerRangeTenderType( object);
}
//-----------------------------------土地----------------------------------
//央企数字化经营系统 土地交易 //央企数字化经营系统 土地交易
@RequestMapping("/countLandMarketByType") @RequestMapping("/countLandMarketByType")
public AjaxResult countLandMarketByType(@RequestBody JSONObject object){ public AjaxResult countLandMarketByType(@RequestBody JSONObject object){
...@@ -99,6 +130,10 @@ public class MarketAnalysisController extends BaseController { ...@@ -99,6 +130,10 @@ public class MarketAnalysisController extends BaseController {
return marketAnalysisService.countLandMarketByYear(); return marketAnalysisService.countLandMarketByYear();
} }
//-----------------------------------招标----------------------------------
//央企数字化经营系统 全国公招项目统计 //央企数字化经营系统 全国公招项目统计
@RequestMapping("/countNewsBidByYear") @RequestMapping("/countNewsBidByYear")
public AjaxResult countNewsBidByYear(){ public AjaxResult countNewsBidByYear(){
......
...@@ -80,13 +80,38 @@ public class MarketAnalysisService { ...@@ -80,13 +80,38 @@ public class MarketAnalysisService {
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
public AjaxResult countLandMarketByType(JSONObject object) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countLandMarketByType", object);
return BeanUtil.toBean(map, AjaxResult.class);
}
public AjaxResult countBidGroupByProvince(JSONObject object) { public AjaxResult countBidGroupByProvince(JSONObject object) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countBidGroupByProvince", object); Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countBidGroupByProvince", object);
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
public AjaxResult countLandMarketByType(JSONObject object) { public AjaxResult countBidByType(JSONObject object) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countLandMarketByType", object); Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countBidByType", object);
return BeanUtil.toBean(map, AjaxResult.class);
}
public AjaxResult rangeBidMoney(JSONObject object) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/rangeBidMoney", object);
return BeanUtil.toBean(map, AjaxResult.class);
}
public AjaxResult rangeBidFiveYears() {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/rangeBidFiveYears", null);
return BeanUtil.toBean(map, AjaxResult.class);
}
public AjaxResult lowerRateByYear(JSONObject object) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/lowerRateByYear", object);
return BeanUtil.toBean(map, AjaxResult.class);
}
public AjaxResult lowerRangeTenderType(JSONObject object) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/lowerRangeTenderType", object);
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment