Merge branch 'master' of 192.168.60.201:root/dsk-operate-sys

# Conflicts:
#	dsk-admin/src/main/java/com/dsk/web/controller/search/service/MarketAnalysisService.java
商机

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

@@ -58,4 +58,20 @@ public class BusinessOpportunityRadarController {
         return opportunityRadarService.jskBidNewsPage(compose);
     }
 
+
+    /*
+     * 专项债查询
+     */
+    @RequestMapping("/bondProjectPage")
+    public AjaxResult bondProjectPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.bondProjectPage(compose);
+    }
+
+    /*
+     * 投标计划查询
+     */
+    @RequestMapping("/jskBidPlanPage")
+    public AjaxResult jskBidPlanPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidPlanPage(compose);
+    }
 }

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

@@ -21,4 +21,8 @@ public interface BusinessOpportunityRadarService {
     AjaxResult enterprisePage(ComposeQueryDto compose);
 
     AjaxResult enterpriseByName(ComposeQueryDto compose);
+
+    AjaxResult bondProjectPage(ComposeQueryDto compose);
+
+    AjaxResult jskBidPlanPage(ComposeQueryDto compose);
 }

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

@@ -60,4 +60,16 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
         Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/enterprice/findByName", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    @Override
+    public AjaxResult bondProjectPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/bondProject/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult jskBidPlanPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBidPlan/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }

dsk-common/src/main/java/com/dsk/common/dtos/ComposeQueryDto.java

@@ -58,6 +58,10 @@ public class ComposeQueryDto {
 	JskBidCandidateDto jskBidCandidateDto;
 	//中标公示
 	JskBidWinListDto jskBidWinListDto;
+	//专项债项目
+	SpecialBondProjectDto specialBondProjectDto;
+	//投标计划
+	JskBidPlanDto jskBidPlanDto;
 
 	String achievementQueryType;
 

dsk-common/src/main/java/com/dsk/common/dtos/JskBidPlanDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class JskBidPlanDto {
+
+
+	String id;
+
+	String uuid;
+
+	String title;
+
+	String projectName;
+
+	String projectNumber;
+	//招标人
+	String tenderee;
+
+	String tendereeId;
+
+	String projectScale;
+
+	String province;
+
+	String city;
+
+	String area;
+
+	String domicile;
+	//标的物类型
+	String objectType;
+	//项目类型
+	String projectType;
+	//招标方式
+	String tenderWay;
+	//合同预估金额
+	Double planTenderAmount;
+	Double startPlanTenderAmount;
+	Double endPlanTenderAmount;
+	//资金来源
+	String projecetCapitalSource;
+	//发布时间
+	String issueTime;
+	//来源网站
+	String sourceName;
+
+	/**
+	 * 修改时间
+	 */
+	String updateTime;
+}

dsk-common/src/main/java/com/dsk/common/dtos/SpecialBondProjectDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class SpecialBondProjectDto {
+
+
+	Long id;
+
+	String uuid;
+
+	String projectName;
+
+	String projectType;
+	//项目总投资
+	String projectTotalInvestment;
+	//项目资本金
+	String projectCapital;
+	//专项债金额
+	String specialCapital;
+	//项目主体
+	String projectEntity;
+	//项目主体id
+	Long projectEntityId;
+	//主管部门
+	String chargeDepartment;
+	//实施单位
+	String piu;
+
+	Long piuId;
+
+	String domicile;
+
+	String province;
+
+	String city;
+
+	String area;
+
+}