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

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseBussinessController.java

@@ -26,67 +26,67 @@ public class EnterpriseBussinessController {
     @Autowired
     EnterpriseBussinessService enterpriseBussinessService;
 
-    @ApiOperation(value = "客户信息列表")
+    @ApiOperation(value = "客户信息列表（openApi）")
     @RequestMapping(value = "/clientPage", method = RequestMethod.POST)
     public TableDataInfo clientPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.clientPage(paramMap);
     }
 
-    @ApiOperation(value = "客户项目列表")
+    @ApiOperation(value = "客户项目列表（openApi）")
     @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
     public TableDataInfo clientProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.clientProjectPage(paramMap);
     }
 
-    @ApiOperation(value = "投标记录列表（开标记录）")
+    @ApiOperation(value = "投标记录列表（开标记录）（openApi）")
     @RequestMapping(value = "/tenderPage",method = RequestMethod.POST)
     public TableDataInfo tenderPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.tenderPage(paramMap);
     }
 
-    @ApiOperation(value = "投标记录详情（开标记录）")
+    @ApiOperation(value = "投标记录详情（开标记录）（openApi）")
     @RequestMapping(value = "/tenderDetail",method = RequestMethod.POST)
     public R tenderDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.tenderDetail(paramMap);
     }
 
-    @ApiOperation(value = "供应商列表")
+    @ApiOperation(value = "供应商列表（openApi）")
     @RequestMapping(value = "/supplierPage",method = RequestMethod.POST)
     public TableDataInfo supplierPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.supplierPage(paramMap);
     }
 
-    @ApiOperation(value = "供应商项目列表")
+    @ApiOperation(value = "供应商项目列表（openApi）")
     @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
     public TableDataInfo supplierProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.supplierProjectPage(paramMap);
     }
 
-    @ApiOperation(value = "中标项目详情")
+    @ApiOperation(value = "中标项目详情（openApi）")
     @RequestMapping(value = "/projectDetail", method = RequestMethod.POST)
     public R projectDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.projectDetail(paramMap);
     }
 
-    @ApiOperation(value = "招标代理常合作代理机构列表")
+    @ApiOperation(value = "招标代理常合作代理机构列表（openApi）")
     @RequestMapping(value = "/oftenAgencyPage",method = RequestMethod.POST)
     public TableDataInfo oftenAgencyPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.oftenAgencyPage(paramMap);
     }
 
-    @ApiOperation(value = "招标合作明细列表")
+    @ApiOperation(value = "招标合作明细列表（openApi）")
     @RequestMapping(value = "/bidCooperatePage", method = RequestMethod.POST)
     public TableDataInfo bidCooperatePage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.bidCooperatePage(paramMap);
     }
 
-    @ApiOperation(value = "历史发包列表")
+    @ApiOperation(value = "历史发包列表（openApi）")
     @RequestMapping(value = "/historySendPage", method = RequestMethod.POST)
     public TableDataInfo historySendPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.historySendPage(paramMap);
     }
 
-    @ApiOperation(value = "历史发包省份")
+    @ApiOperation(value = "历史发包省份（openApi）")
     @RequestMapping(value = "/historySendProvince", method = RequestMethod.POST)
     public R historySendProvince(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.historySendProvince(paramMap);

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java

@@ -95,7 +95,7 @@ public class EnterpriseController {
 
     @ApiOperation(value = "工商股东信息（openApi）")
     @PostMapping(value = "bestStockPage")
-    public TableDataInfo bestStockPage(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
+    public TableDataInfo bestStockPage(@RequestBody @Valid EnterpriseBestStockPageBody vo) throws Exception {
         return enterpriseService.bestStockPage(vo);
     }
 

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseCreditController.java

@@ -29,97 +29,97 @@ public class EnterpriseCreditController {
     EnterpriseCreditService enterpriseCreditService;
 
     @RequestMapping(value = "/penalizePage", method = RequestMethod.POST)
-    @ApiOperation(value = "行政处罚列表")
+    @ApiOperation(value = "行政处罚列表（openApi）")
     public TableDataInfo penalizePage(@RequestBody @Valid EnterpriseCreditPenalizePageBody body) throws Exception {
         return enterpriseCreditService.penalizePage(body);
     }
 
     @RequestMapping(value = "/penalizeReasonType", method = RequestMethod.POST)
-    @ApiOperation(value = "行政处罚类型")
+    @ApiOperation(value = "行政处罚类型（openApi）")
     public R penalizeReasonType(@RequestBody @Valid EnterpriseCreditPenalizeReasonTypeBody body) throws Exception {
         return enterpriseCreditService.penalizeReasonType(body);
     }
 
     @RequestMapping(value = "/abnormalPage", method = RequestMethod.POST)
-    @ApiOperation(value = "经营异常列表")
+    @ApiOperation(value = "经营异常列表（openApi）")
     public TableDataInfo abnormalPage(@RequestBody @Valid EnterpriseCreditAbnormalPageBody body) throws Exception {
         return enterpriseCreditService.abnormalPage(body);
     }
 
     @RequestMapping(value = "/abnormalYears", method = RequestMethod.POST)
-    @ApiOperation(value = "经营异常年份")
+    @ApiOperation(value = "经营异常年份（openApi）")
     public R abnormalYears(@RequestBody @Valid EnterpriseCreditAbnormalYearsBody body) throws Exception {
         return enterpriseCreditService.abnormalYears(body);
     }
 
     @RequestMapping(value = "/executedPersonsPage", method = RequestMethod.POST)
-    @ApiOperation(value = "被执行人列表")
+    @ApiOperation(value = "被执行人列表（openApi）")
     public TableDataInfo executedPersonsPage(@RequestBody @Valid EnterpriseCreditExecutedPersonsPageBody body) throws Exception {
         return enterpriseCreditService.executedPersonsPage(body);
     }
 
     @RequestMapping(value = "/executedPage", method = RequestMethod.POST)
-    @ApiOperation(value = "失信被执行人列表")
+    @ApiOperation(value = "失信被执行人列表（openApi）")
     public TableDataInfo executedPage(@RequestBody @Valid EnterpriseCreditExecutedPageBody body) throws Exception {
         return enterpriseCreditService.executedPage(body);
     }
 
     @RequestMapping(value = "/lawsuitsPage", method = RequestMethod.POST)
-    @ApiOperation(value = "裁判文书列表")
+    @ApiOperation(value = "裁判文书列表（openApi）")
     public TableDataInfo lawsuitsPage(@RequestBody @Valid EnterpriseCreditLawsuitsPageBody body) throws Exception {
         return enterpriseCreditService.lawsuitsPage(body);
     }
 
     @RequestMapping(value = "/lawsuitsCauseAction", method = RequestMethod.POST)
-    @ApiOperation(value = "裁判文书案由")
+    @ApiOperation(value = "裁判文书案由（openApi）")
     public R lawsuitsCauseAction(@RequestBody @Valid EnterpriseCreditLawsuitsCauseActionBody body) throws Exception {
         return enterpriseCreditService.lawsuitsCauseAction(body);
     }
 
     @RequestMapping(value = "/lawsuitsRole", method = RequestMethod.POST)
-    @ApiOperation(value = "裁判文书身份")
+    @ApiOperation(value = "裁判文书身份（openApi）")
     public R lawsuitsRole(@RequestBody @Valid EnterpriseCreditLawsuitsRoleBody body) throws Exception {
         return enterpriseCreditService.lawsuitsRole(body);
     }
 
     @RequestMapping(value = "/noticesPage", method = RequestMethod.POST)
-    @ApiOperation(value = "法院公告列表")
+    @ApiOperation(value = "法院公告列表（openApi）")
     public TableDataInfo noticesPage(@RequestBody @Valid EnterpriseCreditNoticePageBody body) throws Exception {
         return enterpriseCreditService.noticesPage(body);
     }
 
     @RequestMapping(value = "/noticesType", method = RequestMethod.POST)
-    @ApiOperation(value = "法院公告类型")
+    @ApiOperation(value = "法院公告类型（openApi）")
     public R noticesType(@RequestBody @Valid EnterpriseCreditNoticeTypeBody body) throws Exception {
         return enterpriseCreditService.noticesType(body);
     }
 
     @RequestMapping(value = "/noticesRole", method = RequestMethod.POST)
-    @ApiOperation(value = "法院公告身份")
+    @ApiOperation(value = "法院公告身份（openApi）")
     public R noticesRole(@RequestBody @Valid EnterpriseCreditNoticeRoleBody body) throws Exception {
         return enterpriseCreditService.noticesRole(body);
     }
 
     @RequestMapping(value = "/noticesCaseReason", method = RequestMethod.POST)
-    @ApiOperation(value = "法院公告案由")
+    @ApiOperation(value = "法院公告案由（openApi）")
     public R noticesCaseReason(@RequestBody @Valid EnterpriseCreditNoticeCaseReasonBody body) throws Exception {
         return enterpriseCreditService.noticesCaseReason(body);
     }
 
     @RequestMapping(value = "/kaitingPage", method = RequestMethod.POST)
-    @ApiOperation(value = "开庭公告列表")
+    @ApiOperation(value = "开庭公告列表（openApi）")
     public TableDataInfo kaitingPage(@RequestBody @Valid EnterpriseCreditKaitingPageBody body) throws Exception {
         return enterpriseCreditService.kaitingPage(body);
     }
 
     @RequestMapping(value = "/kaitingCauseAction", method = RequestMethod.POST)
-    @ApiOperation(value = "开庭公告案由")
+    @ApiOperation(value = "开庭公告案由（openApi）")
     public R kaitingCauseAction(@RequestBody @Valid EnterpriseCreditKaitingCauseActionBody body) throws Exception {
         return enterpriseCreditService.kaitingCauseAction(body);
     }
 
     @RequestMapping(value = "/kaitingPureRole", method = RequestMethod.POST)
-    @ApiOperation(value = "开庭公告当事人身份")
+    @ApiOperation(value = "开庭公告当事人身份（openApi）")
     public R kaitingPureRole(@RequestBody @Valid EnterpriseCreditKaitingPureRoleBody body) throws Exception {
         return enterpriseCreditService.kaitingPureRole(body);
     }

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseProjectController.java

@@ -29,133 +29,133 @@ public class EnterpriseProjectController {
     EnterpriseProjectService enterpriseProjectService;
 
 
-    @ApiOperation(value = "土地交易列表")
+    @ApiOperation(value = "土地交易列表（openApi）")
     @RequestMapping(value = "/landTransactionPage", method = RequestMethod.POST)
     public TableDataInfo landTransactionPage(@RequestBody @Valid EnterpriseProjectLandTransactionPageBody body) throws Exception {
         return enterpriseProjectService.landTransactionPage(body);
     }
 
-    @ApiOperation(value = "土地用途列表")
+    @ApiOperation(value = "土地用途列表（openApi）")
     @RequestMapping(value = "/landUse", method = RequestMethod.POST)
     public R landUse(@RequestBody @Valid EnterpriseProjectLandUseBody body) throws Exception {
         return enterpriseProjectService.landUse(body);
     }
 
-    @ApiOperation(value = "土地信息详情")
+    @ApiOperation(value = "土地信息详情（openApi）")
     @RequestMapping(value = "/landDetail",method = RequestMethod.POST)
     public R landDetail(@RequestBody @Valid EnterpriseProjectLandDetailBody body) throws Exception {
         return enterpriseProjectService.landDetail(body);
     }
 
-    @ApiOperation(value = "拟建项目列表")
+    @ApiOperation(value = "拟建项目列表（openApi）")
     @RequestMapping(value = "/approvalProjectPage",method = RequestMethod.POST)
     public TableDataInfo approvalProjectPage(@RequestBody @Valid EnterpriseProjectApprovalProjectPageBody body) throws Exception {
         return enterpriseProjectService.approvalProjectPage(body);
     }
 
-    @ApiOperation(value = "拟建项目详情基本信息")
+    @ApiOperation(value = "拟建项目详情基本信息（openApi）")
     @RequestMapping(value = "/approvalInfoDetail",method = RequestMethod.POST)
     public R approvalInfoDetail(@RequestBody @Valid EnterpriseProjectApprovalInfoDetailBody body) throws Exception {
         return enterpriseProjectService.approvalInfoDetail(body);
     }
 
-    @ApiOperation(value = "拟建项目详情立项审批列表")
+    @ApiOperation(value = "拟建项目详情立项审批列表（openApi）")
     @RequestMapping(value = "/approvalExaminePage",method = RequestMethod.POST)
     public TableDataInfo approvalExaminePage(@RequestBody @Valid EnterpriseProjectApprovalExaminePageBody body) throws Exception {
         return enterpriseProjectService.approvalExaminePage(body);
     }
 
-    @ApiOperation(value = "拟建项目详情民间推介列表")
+    @ApiOperation(value = "拟建项目详情民间推介列表（openApi）")
     @RequestMapping(value = "/approvalMarketingPage", method = RequestMethod.POST)
     public TableDataInfo approvalMarketingPage(@RequestBody @Valid EnterpriseProjectApprovalMarketingPageBody body) throws Exception {
         return enterpriseProjectService.approvalMarketingPage(body);
     }
 
-    @ApiOperation(value = "专项债项目列表")
+    @ApiOperation(value = "专项债项目列表（openApi）")
     @RequestMapping(value = "/specialDebtProjectPage", method = RequestMethod.POST)
     public TableDataInfo specialDebtProjectPage(@RequestBody @Valid EnterpriseProjectSpecialDebtProjectPageBody  body) throws Exception {
         return enterpriseProjectService.specialDebtProjectPage(body);
     }
 
-    @ApiOperation(value = "专项债项目详情")
+    @ApiOperation(value = "专项债项目详情（openApi）")
     @RequestMapping(value = "/specialDebtProjectDetail", method = RequestMethod.POST)
     public R specialDebtProjectDetail(@RequestBody @Valid EnterpriseProjectSpecialDebtProjectDetailBody body) throws Exception {
         return enterpriseProjectService.specialDebtProjectDetail(body);
     }
 
-    @ApiOperation(value = "专项债列表")
+    @ApiOperation(value = "专项债列表（openApi）")
     @RequestMapping(value = "/specialDebtPage", method = RequestMethod.POST)
     public TableDataInfo specialDebtPage(@RequestBody @Valid EnterpriseProjectSpecialDebtPageBody body) throws Exception {
         return enterpriseProjectService.specialDebtPage(body);
     }
 
-    @ApiOperation(value = "招标公告列表")
+    @ApiOperation(value = "招标公告列表（openApi）")
     @RequestMapping(value = "/bidNoticePage",method = RequestMethod.POST)
     public TableDataInfo bidNoticePage(@RequestBody @Valid EnterpriseProjectBidNoticePageBody body) throws Exception {
         return enterpriseProjectService.bidNoticePage(body);
     }
 
-    @ApiOperation(value = "招标公告招标类别")
+    @ApiOperation(value = "招标公告招标类别（openApi）")
     @RequestMapping(value = "/bidNoticeTenderStage", method = RequestMethod.POST)
     public R bidNoticeTenderStage(@RequestBody @Valid EnterpriseProjectBidNoticeTenderStageBody body) throws Exception {
         return enterpriseProjectService.bidNoticeTenderStage(body);
     }
 
-    @ApiOperation(value = "招标公告招标地区")
+    @ApiOperation(value = "招标公告招标地区（openApi）")
     @RequestMapping(value = "/bidNoticeArea", method = RequestMethod.POST)
     public R bidNoticeArea(@RequestBody @Valid EnterpriseProjectBidNoticeAreaBody body) throws Exception {
         return enterpriseProjectService.bidNoticeArea(body);
     }
 
-    @ApiOperation(value = "招标公告详情")
+    @ApiOperation(value = "招标公告详情（openApi）")
     @RequestMapping(value = "/bidNoticeDetail", method = RequestMethod.POST)
     public R bidNoticeDetail(@RequestBody @Valid EnterpriseProjectBidNoticeDetailBody body) throws Exception {
         return enterpriseProjectService.bidNoticeDetail(body);
     }
 
-    @ApiOperation(value = "招标计划列表")
+    @ApiOperation(value = "招标计划列表（openApi）")
     @RequestMapping(value = "/bidPlanPage",method = RequestMethod.POST)
     public TableDataInfo bidPlanPage(@RequestBody @Valid EnterpriseProjectBidPlanPageBody body) throws Exception {
         return enterpriseProjectService.bidPlanPage(body);
     }
 
-    @ApiOperation(value = "招标计划详情")
+    @ApiOperation(value = "招标计划详情（openApi）")
     @RequestMapping(value = "/bidPlanDetail", method = RequestMethod.POST)
     public R bidPlanDetail(@RequestBody @Valid EnterpriseProjectBidPlanDetailBody body) throws Exception {
         return enterpriseProjectService.bidPlanDetail(body);
     }
 
-    @ApiOperation(value = "标讯pro招标公告列表")
+    @ApiOperation(value = "标讯pro招标公告列表（openApi）")
     @RequestMapping(value = "/bidNoticeProPage", method = RequestMethod.POST)
     public TableDataInfo bidNoticeProPage(@RequestBody @Valid EnterpriseProjectBidNoticeProPageBody body) throws Exception {
         return enterpriseProjectService.bidNoticeProPage(body);
     }
 
-    @ApiOperation(value = "标讯pro招标公告项目类别")
+    @ApiOperation(value = "标讯pro招标公告项目类别（openApi）")
     @RequestMapping(value = "/bidNoticeProProjectType", method = RequestMethod.POST)
     public R bidNoticeProProjectType(@RequestBody @Valid EnterpriseProjectBidNoticeProProjectTypeBody body) throws Exception {
         return enterpriseProjectService.bidNoticeProProjectType(body);
     }
 
-    @ApiOperation(value = "标讯pro招标公告工程类别")
+    @ApiOperation(value = "标讯pro招标公告工程类别（openApi）")
     @RequestMapping(value = "/bidNoticeProProjectPurposes", method = RequestMethod.POST)
     public R bidNoticeProProjectPurposes(@RequestBody @Valid EnterpriseProjectBidNoticeProProjectPurposesBody body) throws Exception {
         return enterpriseProjectService.bidNoticeProProjectPurposes(body);
     }
 
-    @ApiOperation(value = "标讯pro招标公告评标办法")
+    @ApiOperation(value = "标讯pro招标公告评标办法（openApi）")
     @RequestMapping(value = "/bidNoticeProAssessmentWay", method = RequestMethod.POST)
     public R bidNoticeProAssessmentWay(@RequestBody @Valid EnterpriseProjectBidNoticeProAssessmentWayBody body) throws Exception {
         return enterpriseProjectService.bidNoticeProAssessmentWay(body);
     }
 
-    @ApiOperation(value = "标讯pro招标公告详情")
+    @ApiOperation(value = "标讯pro招标公告详情（openApi）")
     @RequestMapping(value = "/bidNoticeProDetail", method = RequestMethod.POST)
     public R bidNoticeProDetail(@RequestBody @Valid EnterpriseProjectBidNoticeProDetailBody body) throws Exception {
         return enterpriseProjectService.bidNoticeProDetail(body);
     }
 
-    @ApiOperation(value = "行政许可列表")
+    @ApiOperation(value = "行政许可列表（openApi）")
     @RequestMapping(value = "/creditXzxkPage", method = RequestMethod.POST)
     public TableDataInfo creditXzxkPage(@RequestBody @Valid EnterpriseProjectCreditXzxkPageBody body) throws Exception {
         return enterpriseProjectService.creditXzxkPage(body);

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

@@ -74,4 +74,12 @@ public class BusinessOpportunityRadarController {
     public AjaxResult jskBidPlanPage(@RequestBody ComposeQueryDto compose) {
         return opportunityRadarService.jskBidPlanPage(compose);
     }
+
+    /*
+     * 投标计划查询
+     */
+    @RequestMapping("/jskBidPlan/getCapitalSourceSelect")
+    public AjaxResult getCapitalSourceSelect() {
+        return opportunityRadarService.getCapitalSourceSelect();
+    }
 }

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

@@ -27,4 +27,7 @@ public interface BusinessOpportunityRadarService {
     AjaxResult bondProjectPage(ComposeQueryDto compose);
 
     AjaxResult jskBidPlanPage(ComposeQueryDto compose);
+
+    AjaxResult getCapitalSourceSelect();
+
 }

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

@@ -82,4 +82,10 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    @Override
+    public AjaxResult getCapitalSourceSelect() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/getCapitalSourceSelect", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }

dsk-admin/src/main/resources/logback.xml

@@ -20,14 +20,14 @@
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/operate-sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<maxHistory>10</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
-            <level>INFO</level>
+            <level>DEBUG</level>
             <!-- 匹配时的操作：接收（记录） -->
             <onMatch>ACCEPT</onMatch>
             <!-- 不匹配时的操作：拒绝（不记录） -->
@@ -42,7 +42,7 @@
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/operate-sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<maxHistory>10</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -64,7 +64,7 @@
             <!-- 按天回滚 daily -->
             <fileNamePattern>${log.path}/operate-sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>10</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseAffiliatesBody.java

@@ -18,5 +18,7 @@ public class EnterpriseAffiliatesBody extends BasePage {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+    private Integer hasBid;
+
 
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseInvestmentBody.java

@@ -17,6 +17,9 @@ public class EnterpriseInvestmentBody extends BasePage {
     //企业Id
     @NotNull(message = "企业id不能为空")
     private Integer cid;
+    private Integer hasBid;
+    private double stockPercentageMin;
+    private double stockPercentageMax;
 
 
 }

dsk-operate-ui/src/api/detail/party-a/overview.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 // 企业数据统计
 export function statistic(data) {
   return request({
-    url: '/enterprise/statistic（建设库）',
+    url: '/enterprise/statistic',
     method: 'post',
     data: data
   })

dsk-operate-ui/src/api/macro/macro.js

@@ -174,6 +174,31 @@ export function enterprise(param) {
   })
 }
 
+//城投平台-企业查询选项
+export function uipGroupData() {
+  return request({
+    url: '/enterprise/uipGroupData',
+    method: 'POST'
+  })
+}
+
+//城投平台-分页列表
+export function urbanInvestmentPage(param) {
+  return request({
+    url: '/urbanInvestment/page',
+    method: 'POST',
+    data: param
+  })
+}
+//城投平台-城投平台统计
+export function urbanInvestmentStatistics(param) {
+  return request({
+    url: '/urbanInvestment/statistics',
+    method: 'POST',
+    data: param
+  })
+}
+