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

@@ -2,6 +2,7 @@ package com.dsk.web.controller.dsk;
 
 
 import com.dsk.common.core.domain.R;
+import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.system.dskService.EnterpriseBussinessService;
 import io.swagger.annotations.ApiOperation;
@@ -28,67 +29,67 @@ public class EnterpriseBussinessController {
 
     @ApiOperation(value = "客户信息列表（openApi）")
     @RequestMapping(value = "/clientPage", method = RequestMethod.POST)
-    public TableDataInfo clientPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo clientPage(@RequestBody EnterpriseBussinessClientPageBody paramMap) throws Exception {
         return enterpriseBussinessService.clientPage(paramMap);
     }
 
     @ApiOperation(value = "客户项目列表（openApi）")
     @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
-    public TableDataInfo clientProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo clientProjectPage(@RequestBody EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.clientProjectPage(paramMap);
     }
 
     @ApiOperation(value = "投标记录列表（开标记录）（openApi）")
     @RequestMapping(value = "/tenderPage",method = RequestMethod.POST)
-    public TableDataInfo tenderPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo tenderPage(@RequestBody EnterpriseBussinessTenderPageBody paramMap) throws Exception {
         return enterpriseBussinessService.tenderPage(paramMap);
     }
 
     @ApiOperation(value = "投标记录详情（开标记录）（openApi）")
     @RequestMapping(value = "/tenderDetail",method = RequestMethod.POST)
-    public R tenderDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public R tenderDetail(@RequestBody EnterpriseBussinessTenderDetailBody paramMap) throws Exception {
         return enterpriseBussinessService.tenderDetail(paramMap);
     }
 
     @ApiOperation(value = "供应商列表（openApi）")
     @RequestMapping(value = "/supplierPage",method = RequestMethod.POST)
-    public TableDataInfo supplierPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo supplierPage(@RequestBody EnterpriseBussinessSupplierPageBody paramMap) throws Exception {
         return enterpriseBussinessService.supplierPage(paramMap);
     }
 
     @ApiOperation(value = "供应商项目列表（openApi）")
     @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
-    public TableDataInfo supplierProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo supplierProjectPage(@RequestBody EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.supplierProjectPage(paramMap);
     }
 
     @ApiOperation(value = "中标项目详情（openApi）")
     @RequestMapping(value = "/projectDetail", method = RequestMethod.POST)
-    public R projectDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public R projectDetail(@RequestBody EnterpriseBussinessProjectDetailBody paramMap) throws Exception {
         return enterpriseBussinessService.projectDetail(paramMap);
     }
 
     @ApiOperation(value = "招标代理常合作代理机构列表（openApi）")
     @RequestMapping(value = "/oftenAgencyPage",method = RequestMethod.POST)
-    public TableDataInfo oftenAgencyPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo oftenAgencyPage(@RequestBody EnterpriseBussinessOftenAgencyPageBody paramMap) throws Exception {
         return enterpriseBussinessService.oftenAgencyPage(paramMap);
     }
 
     @ApiOperation(value = "招标合作明细列表（openApi）")
     @RequestMapping(value = "/bidCooperatePage", method = RequestMethod.POST)
-    public TableDataInfo bidCooperatePage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo bidCooperatePage(@RequestBody EnterpriseBussinessBidCooperatePageBody paramMap) throws Exception {
         return enterpriseBussinessService.bidCooperatePage(paramMap);
     }
 
     @ApiOperation(value = "历史发包列表（openApi）")
     @RequestMapping(value = "/historySendPage", method = RequestMethod.POST)
-    public TableDataInfo historySendPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo historySendPage(@RequestBody EnterpriseBussinessHistorySendPageBody paramMap) throws Exception {
         return enterpriseBussinessService.historySendPage(paramMap);
     }
 
     @ApiOperation(value = "历史发包省份（openApi）")
     @RequestMapping(value = "/historySendProvince", method = RequestMethod.POST)
-    public R historySendProvince(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public R historySendProvince(@RequestBody EnterpriseBussinessHistorySendProvinceBody paramMap) throws Exception {
         return enterpriseBussinessService.historySendProvince(paramMap);
     }
 

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessBidCooperatePageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer tendereeId;
+
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer agencyId;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessClientPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+    /*
+     * 排序字段：1金额倒序，2金额正序，3时间倒序，4时间正序，5次数倒序，6次数正序
+     */
+    private Integer sort;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessClientProjectPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer unitId;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessHistorySendPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /*
+     * 排序条件：1金额倒序，2金额正序，3时间倒序，4时间正序，7下浮率倒序，8下浮率正序，9工期倒序，10工期正序
+     */
+    private Integer sort;
+
+    /**
+     * 开始时间（年月日）
+     */
+    private String dateFrom;
+
+    /**
+     * 截止时间（年月日）
+     */
+    private String dateTo;
+
+    /**
+     * 省份id（年月日）
+     */
+    private String provinceId;
+
+    /**
+     * 最小金额
+     */
+    private Double amountMin;
+
+    /**
+     * 最大金额
+     */
+    private Double amountMax;
+
+
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessHistorySendProvinceBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessOftenAgencyPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+    /*
+     * 排序字段：3时间倒序，4时间正序，5次数倒序，6次数正序
+     */
+    private Integer sort;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessProjectDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessSupplierPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+    /*
+     * 排序字段：1金额倒序，2金额正序，3时间倒序，4时间正序，5次数倒序，6次数正序
+     */
+    private Integer sort;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer unitId;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+    
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessTenderDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessTenderPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+}

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

@@ -23,5 +23,23 @@ let bondProjectPage= function bondProjectPage(param) {
     data: param
   })
 }
+// 专项债项目详情查询
+let specialDebtProjectDetail= function specialDebtProjectDetail(param) {
+  return request({
+    url: '/enterpriseProject/specialDebtProjectDetail',
+    method: 'post',
+    data: param
+  })
+}
+// 专项债项目详情查询
+let specialDebtPage= function specialDebtPage(param) {
+  return request({
+    url: '/enterpriseProject/specialDebtPage',
+    method: 'post',
+    data: param
+  })
+}
+
+
 
-export default {importData,searchDic,bondProjectPage}
\ No newline at end of file
+export default {importData,searchDic,bondProjectPage,specialDebtProjectDetail,specialDebtPage}
\ No newline at end of file

dsk-operate-ui/src/router/index.js

@@ -153,7 +153,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/debtProject/details/:id(\\d+)',
+	      path: '/radar/debtProject/details/:id',
 	      component: () => import('@/views/radar/debtProject/details'),
 	      name: 'debtProjectDetails',
 	      meta: { title: '企业专项债详情', icon: 'radar' }
@@ -167,7 +167,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/Land/details/:id(\\d+)',
+	      path: '/radar/Land/details/:id',
 	      component: () => import('@/views/radar/Land/details'),
 	      name: 'LandDetails',
 	      meta: { title: '土地交易详情', icon: 'radar' }
@@ -181,7 +181,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/Establishment/details/:id(\\d+)',
+	      path: '/radar/Establishment/details/:id',
 	      component: () => import('@/views/radar/Establishment/details'),
 	      name: 'EstablishmentDetails',
 	      meta: { title: '拟建项目详情', icon: 'radar' }
@@ -195,7 +195,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/bxprozbgg/details/:id(\\d+)',
+	      path: '/radar/bxprozbgg/details/:id',
 	      component: () => import('@/views/radar/bxprozbgg/details'),
 	      name: 'bxprozbggDetails',
 	      meta: { title: '标讯pro项目详情', icon: 'radar' }
@@ -209,7 +209,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/Tender/details/:id(\\d+)',
+	      path: '/radar/Tender/details/:id',
 	      component: () => import('@/views/radar/Tender/details'),
 	      name: 'TenderDetails',
 	      meta: { title: '公招标讯详情', icon: 'radar' }
@@ -223,7 +223,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/BidRecord/details/:id(\\d+)',
+	      path: '/radar/BidRecord/details/:id',
 	      component: () => import('@/views/radar/BidRecord/details'),
 	      name: 'BidRecordDetails',
 	      meta: { title: '开标记录详情', icon: 'radar' }

dsk-operate-ui/src/views/radar/debtProject/details.vue

 <template>
   <div class="app-container qyzx-details">
     <div class="content main1">
-      <div class="title"><img src="@/assets/images/financing/head_icon.png" />重庆至黔江高速铁路项目一项目详情</div>
-      <p>本项目是厦渝高铁通道的重要组成部分，是成渝地区、海西经济区间高速客运交流的主通道;是成渝地区与华南、华东地区间客运交流的辅助通道;是以重庆主城为核心的城际客流的快速客运通道;
-        是整合区域旅游资源，促进沿线旅游资源开发的黄金旅游通道。线路起自重庆站，经巴南、南川、武隆、彭水，终至江，正线全长265公里，设8座，其中新建6座。
-        同步建设重庆东动车所动车出入段，重庆枢纽东环联络线。</p>
+      <div class="title"><img src="@/assets/images/financing/head_icon.png" />{{textList.projectName}}</div>
+      <p>{{textList.projectScale}}</p>
     </div>
     <div class="content main2">
       <div class="common-title">项目筹资</div>
@@ -12,28 +10,28 @@
         <div class="list">
           <div class="item color1">
             <div class="item-left">
-              <h4>535.00<span>亿</span></h4>
+              <h4>{{textList.projectTotalInvestment}}<span>万元</span></h4>
               <p>项目总投资额</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon1.png" />
           </div>
           <div class="item color2">
             <div class="item-left">
-              <h4>535.00<span>亿</span></h4>
+              <h4>{{textList.projectCapital}}<span>万元</span></h4>
               <p>项目资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon2.png" />
           </div>
           <div class="item color3">
             <div class="item-left">
-              <h4>535.00<span>亿</span></h4>
+              <h4>{{textList.econData_013}}<span>万元</span></h4>
               <p>专项债融资</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon3.png" />
           </div>
           <div class="item color4">
             <div class="item-left">
-              <h4>535.00<span>亿</span></h4>
+              <h4>{{textList.specialBondCapital}}<span>万元</span></h4>
               <p>专项债用作资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon4.png" />
@@ -42,28 +40,28 @@
         <div class="list">
           <div class="item color4">
             <div class="item-left">
-              <h4>535.00<span>亿</span></h4>
+              <h4>{{textList.otherFunds}}<span>万元</span></h4>
               <p>其他资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon5.png" />
           </div>
           <div class="item color3">
             <div class="item-left">
-              <h4>535.00<span>亿 / 10只</span></h4>
+              <h4>{{textList.specialBondIssue_number}}<span>万元 / 10只</span></h4>
               <p>专项债融资额/专项债只数</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon6.png" />
           </div>
           <div class="item color4">
             <div class="item-left">
-              <h4>535.00<span>亿</span></h4>
+              <h4>{{textList.otherFinancing}}<span>万元</span></h4>
               <p>其他融资</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon7.png" />
           </div>
           <div class="item color2">
             <div class="item-left">
-              <h4>535.00<span>亿</span></h4>
+              <h4>{{textList.govSupportFunds}}<span>万元</span></h4>
               <p>政府安排资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon8.png" />
@@ -76,27 +74,27 @@
       <div class="main3-box">
         <p>
           <label class="label">项目总收益/项目总债务融资本息(覆盖倍数)</label>
-          <span>1.36倍</span>
+          <span>{{textList.econData_007}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总地方债券融资本息</label>
-          <span>1.96倍</span>
+          <span>{{textList.econData_008}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总投资</label>
-          <span>1.96倍</span>
+          <span>{{textList.econData_009}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总地方债券融资本金</label>
-          <span>1.96倍</span>
+          <span>{{textList.econData_010}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总债务融资本金</label>
-          <span>2.45倍</span>
+          <span>{{textList.econData_011}}</span>
         </p>
         <p>
           <label class="label">项目预测总收益</label>
-          <span>2.45倍</span>
+          <span>{{textList.projectForecastTotalRevenue}}</span>
         </p>
       </div>
     </div>
@@ -104,11 +102,11 @@
       <div class="common-title">项目当事人</div>
       <div class="main4-box">
         <label class="label">项目主体</label>
-        <span>重庆铁路投资集团有限公司</span>
+        <span>{{textList.projectEntity}}</span>
         <label class="label">主管部门</label>
-        <span>-</span>
+        <span>{{textList.chargeDepartment}}</span>
         <label class="label">实施单位</label>
-        <span>重庆铁路投资集团有限公司</span>
+        <span>{{textList.piu}}</span>
       </div>
     </div>
     <div class="content main5">
@@ -137,29 +135,36 @@
 </template>
 
 <script>
+import {encodeStr} from "@/assets/js/common.js"
+import api from '@/api/radar/radar.js';
 export default {
   name: 'debtProjectDetails',
   data() {
     return {
       id:'',
       tableData:[
-        {
-          id:0,
-          name:'20重庆债14(2005938)',
-          time:'2020-09-18',
-          gm:'285.24',
-          zj:'否',
-        }
-      ]
+      ],
+	  "pageNum":1,
+	  "pageSize":10
+	  total:0,
+	  textList:''
     }
   },
   created() {
-    console.log(this.$route.params)
-    this.id=this.$route.params.id
+    this.id=this.$route.params.id;
+	
+	api.specialDebtProjectDetail({id:this.id}).then(res=>{
+		console.log(res);
+		
+	 }).catch(error=>{
+	 	
+	 });
   },
   methods: {
+	specialDebtPage(){
 		
 	}
+  }
 }
 </script>
 
@@ -268,7 +273,7 @@ export default {
         margin-top: 22px;
         p{
           margin: 0;
-          display: inline-block;
+          display: inline-flex;
           width: 50%;
           border-top: 1px solid #E6E9F0;
           border-left: 1px solid #E6E9F0;
@@ -307,6 +312,7 @@ export default {
     .main4{
       .main4-box{
         margin-top: 22px;
+		display: flex;
         .label{
           width: 14%;
           background: #F0F3FA;

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java

@@ -2,6 +2,7 @@ package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.R;
+import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
 import org.slf4j.Logger;
@@ -20,67 +21,67 @@ public class EnterpriseBussinessService {
     private DskOpenApiUtil dskOpenApiUtil;
 
 
-    public TableDataInfo clientPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo clientPage(EnterpriseBussinessClientPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo clientProjectPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo tenderPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo tenderPage(EnterpriseBussinessTenderPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/tenderPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R tenderDetail(Map<String, Object> body) throws Exception {
+    public R tenderDetail(EnterpriseBussinessTenderDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/tenderDetail", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
-    public TableDataInfo supplierPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo supplierPage(EnterpriseBussinessSupplierPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo supplierProjectPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo supplierProjectPage(EnterpriseBussinessSupplierProjectPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R projectDetail(Map<String, Object> body) throws Exception {
+    public R projectDetail(EnterpriseBussinessProjectDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/projectDetail", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
-    public TableDataInfo oftenAgencyPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo oftenAgencyPage(EnterpriseBussinessOftenAgencyPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/oftenAgencyPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo bidCooperatePage(Map<String, Object> body) throws Exception {
+    public TableDataInfo bidCooperatePage(EnterpriseBussinessBidCooperatePageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/bidCooperatePage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo historySendPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo historySendPage(EnterpriseBussinessHistorySendPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/historySendPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R historySendProvince(Map<String, Object> body) throws Exception {
+    public R historySendProvince(EnterpriseBussinessHistorySendProvinceBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/historySendProvince", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -2,6 +2,7 @@ package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.R;
@@ -42,8 +43,31 @@ public class EnterpriseService {
     ICustomerService iCustomerService;
 
     public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
-        return BeanUtil.toBean(map, R.class);
+        Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
+        Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
+        if (200 != companyCode) throw new RuntimeException();
+        Map companyData = MapUtils.getMap(companyMap, "data", null);
+        companyData.put("claimStatus", 0);
+
+        Map<String, Object> uipMap = dskOpenApiUtil.requestBody("/operate/enterprise/financial", BeanUtil.beanToMap(body, false, false));
+        Integer uipCode = MapUtils.getInteger(uipMap, "code", 300);
+        if (200 != uipCode) return R.ok(companyData);
+
+        Map uipData = MapUtils.getMap(uipMap, "data", new HashMap<>());
+        String uipId = MapUtils.getString(uipData, "uipId", null);
+        if (ObjectUtil.isEmpty(uipId)) {
+            return R.ok(companyData);
+        }
+
+        ArrayList<String> uipIds = new ArrayList<>();
+        uipIds.add(uipId);
+        List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusList(uipIds);
+
+        if (CollectionUtils.isNotEmpty(claimStatusList)) {
+            companyMap.put("claimStatus", 1);
+        }
+
+        return R.ok(companyData);
     }
 
     public R statistic(EnterpriseStatisticBody body) throws Exception {