Skip to content

D
dsk-cr20g
Commit 3be03b69 authored by danfuman's avatar danfuman
Browse files
Options

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

parents 608672f1 f2b43518
Expand all Show whitespace changes
Inline Side-by-side
Showing with 829 additions and 117 deletions
dsk-admin/src/main/java/com/dsk/web/controller/dsk/JskCombineInfoController.java
View file @ 3be03b69
...@@ -100,7 +100,7 @@ public class JskCombineInfoController extends BaseController { ...@@ -100,7 +100,7 @@ public class JskCombineInfoController extends BaseController {
} }
/** /**
* 查央企子公司 * 查央企子公司 翻页
*/ */
@PostMapping("/centralEnterprse/child/page") @PostMapping("/centralEnterprse/child/page")
public AjaxResult centralEnterprseChildPage(@RequestBody JSONObject object) { public AjaxResult centralEnterprseChildPage(@RequestBody JSONObject object) {
...@@ -115,6 +115,14 @@ public class JskCombineInfoController extends BaseController { ...@@ -115,6 +115,14 @@ public class JskCombineInfoController extends BaseController {
return baseService.centralEnterprseLocal(object); return baseService.centralEnterprseLocal(object);
} }
/**
* 查地方国企 翻页
*/
@PostMapping("/centralEnterprse/local/page")
public AjaxResult centralEnterprseLocalPage(@RequestBody JSONObject object) {
return baseService.centralEnterprseLocalPage(object);
}
/** /**
* 民营企业 * 民营企业
*/ */
...@@ -124,7 +132,7 @@ public class JskCombineInfoController extends BaseController { ...@@ -124,7 +132,7 @@ public class JskCombineInfoController extends BaseController {
} }
/** /**
* 民营企业 * 民营企业 翻页
*/ */
@PostMapping("/centralEnterprse/social/page") @PostMapping("/centralEnterprse/social/page")
public AjaxResult centralEnterprseSocialPage(@RequestBody JSONObject object) { public AjaxResult centralEnterprseSocialPage(@RequestBody JSONObject object) {
......
dsk-operate-ui/src/api/enterpriseData/enterpriseData.js
View file @ 3be03b69
...@@ -27,6 +27,13 @@ let regionWebList= function regionWebList(param) { ...@@ -27,6 +27,13 @@ let regionWebList= function regionWebList(param) {
method: 'get', method: 'get',
}) })
} }
// 地区
let region= function region(param) {
return request({
url: '/system/region/list/'+param,
method: 'get',
})
}
// 查甲方选项 // 查甲方选项
let uipGroupData= function uipGroupData(param) { let uipGroupData= function uipGroupData(param) {
return request({ return request({
...@@ -92,8 +99,48 @@ let infoHeader= function infoHeader(param) { ...@@ -92,8 +99,48 @@ let infoHeader= function infoHeader(param) {
data: param data: param
}) })
} }
// 搜索集团户
let searchCentralEnterprse= function searchCentralEnterprse(param) {
return request({
url: '/combine/info/index',
method: 'post',
data: param
})
}
// 央企
let centralEnterprse= function centralEnterprse(param) {
return request({
url: '/combine/info/centralEnterprse',
method: 'post',
data: param
})
}
// 央企子集团
let centralEnterprseChild= function centralEnterprseChild(param) {
return request({
url: '/combine/info/centralEnterprse/child',
method: 'post',
data: param
})
}
// 地方国企
let centralEnterprselocal= function centralEnterprselocal(param) {
return request({
url: '/combine/info/centralEnterprse/local',
method: 'post',
data: param
})
}
// 民营集团
let centralEnterprsesocial= function centralEnterprsesocial(param) {
return request({
url: '/combine/info/centralEnterprse/social',
method: 'post',
data: param
})
}
export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim,cancelClaim,enterprisePage,infoHeader,historyClaim,customerStatus} export default {centralEnterprsesocial,centralEnterprselocal,centralEnterprseChild,searchCentralEnterprse,centralEnterprse,region,aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim,cancelClaim,enterprisePage,infoHeader,historyClaim,customerStatus}
dsk-operate-ui/src/assets/styles/project.scss
View file @ 3be03b69
...@@ -597,17 +597,18 @@ ...@@ -597,17 +597,18 @@
float: left; float: left;
width: 16px; width: 16px;
} }
.el-input{ .el-input,.el-textarea {
width: calc(100% - 26px); width: calc(100% - 26px);
display: inline-block; display: inline-block;
} }
.el-input__inner{ .el-input__inner,.el-textarea__inner{
line-height: 16px; line-height: 16px;
height: 16px; height: 16px;
border: 0; border: 0;
padding: 0; padding: 0 0 0 8px;
text-indent: 8px; //float: left;
float: left; color: #232323;
font-size: 14px;
} }
} }
.wr_bot{ .wr_bot{
......
dsk-operate-ui/src/layout/components/AppMain.vue
View file @ 3be03b69
...@@ -42,7 +42,7 @@ export default { ...@@ -42,7 +42,7 @@ export default {
.hasTagsView { .hasTagsView {
.app-main { .app-main {
/* 84 = navbar + tags-view = 50 + 34 */ /* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 56px); min-height: calc(100vh - 68px);
min-width:1440px; min-width:1440px;
background: #F5F5F5; background: #F5F5F5;
overflow: initial; overflow: initial;
......
dsk-operate-ui/src/views/detail/party-a/component/HeadDetailForm.vue
View file @ 3be03b69
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<div class="flex-box query-box"> <div class="flex-box query-box">
<div class="flex-box query-params"> <div class="flex-box query-params">
<div class="flex-box headForm-text"> <div class="flex-box headForm-text">
<img v-if="title" src="@/assets/images/detail/ico_title.png" /> <!-- <img v-if="title" src="@/assets/images/detail/ico_title.png" /> -->
<span class="drawer-title" v-if="title">{{ title }}</span> <!-- <span class="drawer-title" v-if="title">{{ title }}</span> -->
<template v-if="slots"> <template v-if="slots">
<slot name="slot"></slot> <slot name="slot"></slot>
</template> </template>
<div v-else> <!-- <div v-else>
<span class="ability-total" v-if="isTotal">{{ total }}条数据</span> <span class="ability-total" v-if="isTotal">{{ total }}条数据</span>
<span class="ability-total" v-if="amountTotal">，共计合作总金额：<i>{{ amountTotal }}</i>万元</span> <span class="ability-total" v-if="amountTotal">，共计合作总金额：<i>{{ amountTotal }}</i>万元</span>
</div> </div> -->
</div> </div>
<div class="headForm-from"> <div class="headForm-from">
<div class="from-item" :key="i" v-for="(form, i) in formData"> <div class="from-item" :key="i" v-for="(form, i) in formData">
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<!-- 输入框 --> <!-- 输入框 -->
<template v-if="form.type==3"> <template v-if="form.type==3">
<div class="cooperate-name" :id="'detailFocus'+i"> <div class="cooperate-name" :id="'detailFocus'+i">
<el-input @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input> <el-input clearable @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
<span @click="changeSelect">搜索</span> <span @click="changeSelect">搜索</span>
</div> </div>
</template> </template>
...@@ -63,6 +63,14 @@ ...@@ -63,6 +63,14 @@
<el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" /> <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" />
</el-select> </el-select>
</template> </template>
<!-- 金额 -->
<template v-else-if="form.type==6">
<custom-money-select
:moneyList="form.moneyList"
v-model="form.value"
:placeholder="form.placeholder"
@handle-search="changeSelect" />
</template>
<!-- 自定义 --> <!-- 自定义 -->
<template v-if="form.type==0"> <template v-if="form.type==0">
<slot name="slot"></slot> <slot name="slot"></slot>
...@@ -77,8 +85,12 @@ ...@@ -77,8 +85,12 @@
</template> </template>
<script> <script>
import CustomMoneySelect from './CustomMoneySelect'
export default { export default {
name: "HeadDetailForm", name: "HeadDetailForm",
components: {
CustomMoneySelect
},
props: { props: {
title: { title: {
type: String, type: String,
...@@ -129,15 +141,19 @@ export default { ...@@ -129,15 +141,19 @@ export default {
.headForm{ .headForm{
.query-params{ .query-params{
width: 100%; width: 100%;
padding: 8px 17px 8px 13px; padding: 8px 17px 8px 0;
justify-content: space-between;
border-bottom: 1px solid #E1E1E1;
} }
::v-deep .el-input__inner{ ::v-deep .el-input__inner{
border: 0; border: 0;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
} }
::v-deep .custom-money-select{
.el-input__inner{
border: 1px solid #D9D9D9;
}
}
::v-deep .el-form-item{ ::v-deep .el-form-item{
margin-right: 8px !important; margin-right: 8px !important;
} }
...@@ -150,12 +166,6 @@ export default { ...@@ -150,12 +166,6 @@ export default {
height: 17px; height: 17px;
margin-right: 8px; margin-right: 8px;
} }
.drawer-title{
font-size: 16px;
color: #232323;
font-weight: bold;
margin-right: 4px;
}
.ability-total{ .ability-total{
font-size: 12px; font-size: 12px;
color: rgba(35,35,35,0.8); color: rgba(35,35,35,0.8);
......
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ 3be03b69
...@@ -288,6 +288,10 @@ export default { ...@@ -288,6 +288,10 @@ export default {
}, },
handleItem(item){ handleItem(item){
if(item.title=='企业速览'){
item.pathName = 'overview'
}
console.log(item)
this.$emit("currentPath", item) this.$emit("currentPath", item)
}, },
handleSearch(flag){ handleSearch(flag){
......
dsk-operate-ui/src/views/detail/party-a/dealings/component/customDetail.vue
View file @ 3be03b69
<template> <template>
<div class="client-details"> <div class="client-details">
<el-drawer <el-dialog
:visible.sync="drawer" :visible.sync="drawer"
size="60%" size="80%"
custom-class="client-drawer" :title="title"
custom-class="client-dialog"
:with-header="false" :with-header="false"
@closed="cancel"> @closed="cancel">
<head-detail-form <head-detail-form
:title="title"
:form-data="formData" :form-data="formData"
:query-params="queryParams" :query-params="queryParams"
:total="tableDataTotal" :total="tableDataTotal"
...@@ -22,23 +22,15 @@ ...@@ -22,23 +22,15 @@
:tableDataTotal="tableDataTotal" :tableDataTotal="tableDataTotal"
:queryParams="queryParams" :queryParams="queryParams"
@handle-current-change="handleCurrentChange" @handle-current-change="handleCurrentChange"
style="margin: 12px;"
> >
<template slot="projectAllName" slot-scope="scope"> <template slot="sourceType" slot-scope="scope">
<div class="flex-box"> <div class="flex-box">
<img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.snapshootPic" @click="handlePic(scope.row.snapshootPic, true)"/> <div class="a-link" @click="linkTo(scope)" v-if="scope.row.sourceId&&scope.row.sourceType=='中标业绩'" v-html="scope.row.sourceType" style="cursor: pointer"></div>
<div class="a-link" @click="linkTo(scope)" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName" style="cursor: pointer"></div> <span v-else v-html="scope.row.sourceType || '--'"></span>
<span v-else v-html="scope.row.projectAllName || '--'"></span>
</div> </div>
</template> </template>
<template slot="province" slot-scope="scope">
{{scope.row.province}}{{`${scope.row.city?'-'+scope.row.city:''}`}}
</template>
<template slot="lowerRate" slot-scope="scope">
<span>{{scope.row.lowerRate ? scope.row.lowerRate+'%' : '--'}}</span>
</template>
</tables> </tables>
</el-drawer> </el-dialog>
</div> </div>
</template> </template>
...@@ -62,21 +54,20 @@ export default { ...@@ -62,21 +54,20 @@ export default {
drawer: false, drawer: false,
queryParams: { queryParams: {
cid: this.companyId, cid: this.companyId,
unitId: this.data.projectUnitId, companyId: this.data.companyId,
pageNum: 1, pageNum: 1,
pageSize: 20 pageSize: 20
}, },
formData: [ formData: [
{ type: 6, fieldName: 'money', value: '', placeholder: '合同金额', startMoney: 'amountMin', endMoney: 'amountMax' },
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入项目/工程名称查询', options: []}, { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目/工程名称查询', options: []},
], ],
forData: [ forData: [
{label: '合作项目/工程名称', prop: 'projectAllName', width: '720', fixed: true, slot: true}, {label: '项目名称', prop: 'projectName', fixed: true},
{label: '项目/工程金额（万元）', prop: 'winBidAmount', width: '160'}, {label: '公布时间', prop: 'time', width: '100'},
{label: '合作时间', prop: 'winBidTime', width: '100'}, {label: '本次合同金额（万元）', prop: 'amount', width: '160'},
{label: '项目地区', prop: 'province', width: '160', slot: true}, {label: '项目类型', prop: 'projectTtype', width: '130'},
{label: '项目类型', prop: 'boundType', width: '130'}, {label: '数据来源', prop: 'sourceType', width: '90', slot: true}
{label: '工期（天）', prop: 'period', width: '90'},
{label: '下浮率', prop: 'lowerRate', width: '90', slot: true}
], ],
//列表 //列表
tableLoading:false, tableLoading:false,
...@@ -109,7 +100,7 @@ export default { ...@@ -109,7 +100,7 @@ export default {
}, },
linkTo(scope){ linkTo(scope){
this.drawer = false this.drawer = false
this.$router.push(`/biddetail/${scope.row.id}`) this.$router.push(`/biddetail/${scope.row.sourceId}`)
}, },
cancel() { cancel() {
this.$emit('cancel') this.$emit('cancel')
...@@ -120,8 +111,27 @@ export default { ...@@ -120,8 +111,27 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.client-details { .client-details {
::v-deep .client-drawer{ ::v-deep .client-dialog{
width: 80%;
min-width: 900px;
background: #FFFFFF; background: #FFFFFF;
.el-dialog__body{
padding-top: 0;
}
.fixed-table{
.el-table__header-wrapper,.el-table__fixed-header-wrapper{
top: 0;
}
}
.el-dialog__header{
border-bottom: 1px solid #E1E1E1;
}
.el-dialog__title{
font-size: 16px;
color: #232323;
font-weight: bold;
margin-right: 4px;
}
} }
.tip-img{ .tip-img{
width: 14px; width: 14px;
......
dsk-operate-ui/src/views/detail/party-a/dealings/component/supplierDetail.vue
View file @ 3be03b69
<template> <template>
<div class="client-details"> <div class="client-details">
<el-drawer <el-dialog
:visible.sync="drawer" :visible.sync="drawer"
size="60%" size="80%"
custom-class="client-drawer" :title="title"
custom-class="client-dialog"
:with-header="false" :with-header="false"
@closed="cancel"> @closed="cancel">
<head-detail-form <head-detail-form
:title="title"
:form-data="formData" :form-data="formData"
:query-params="queryParams" :query-params="queryParams"
:total="tableDataTotal" :total="tableDataTotal"
...@@ -22,22 +22,14 @@ ...@@ -22,22 +22,14 @@
:tableDataTotal="tableDataTotal" :tableDataTotal="tableDataTotal"
:queryParams="queryParams" :queryParams="queryParams"
@handle-current-change="handleCurrentChange" @handle-current-change="handleCurrentChange"
style="margin: 12px;"
> >
<template slot="projectAllName" slot-scope="scope"> <template slot="projectAllName" slot-scope="scope">
<div class="flex-box"> <div class="flex-box">
<img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.snapshootPic" @click="handlePic(scope.row.snapshootPic, true)"/> <span v-html="scope.row.projectAllName || '--'"></span>
<div class="a-link" @click="linkTo(scope)" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName" style="cursor: pointer"></div> <span v-else v-html="scope.row.projectAllName || '--'"></span>
</div> </div>
</template> </template>
<template slot="province" slot-scope="scope">
{{scope.row.province}}{{`${scope.row.city?'-'+scope.row.city:''}`}}
</template>
<template slot="lowerRate" slot-scope="scope">
<span>{{scope.row.lowerRate ? scope.row.lowerRate+'%' : '--'}}</span>
</template>
</tables> </tables>
</el-drawer> </el-dialog>
</div> </div>
</template> </template>
...@@ -66,16 +58,15 @@ export default { ...@@ -66,16 +58,15 @@ export default {
pageSize: 20 pageSize: 20
}, },
formData: [ formData: [
{ type: 6, fieldName: 'money', value: '', placeholder: '合同金额', startMoney: 'amountMin', endMoney: 'amountMax' },
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260}, { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
], ],
forData: [ forData: [
{label: '合作项目/工程名称', prop: 'projectAllName', width: '720', fixed: true, slot: true}, {label: '项目名称', prop: 'projectAllName', fixed: true, slot: true},
{label: '项目/工程金额（万元）', prop: 'winBidAmount', width: '160'}, {label: '公布时间', prop: 'winBidTime', width: '100'},
{label: '合作时间', prop: 'winBidTime', width: '100'}, {label: '本次合同金额（万元）', prop: 'winBidAmount', width: '160'},
{label: '项目地区', prop: 'province', width: '160', slot: true},
{label: '项目类型', prop: 'boundType', width: '130'}, {label: '项目类型', prop: 'boundType', width: '130'},
{label: '工期（天）', prop: 'period', width: '90'}, {label: '数据来源', prop: 'sourceName', width: '90', slot: true}
{label: '下浮率', prop: 'lowerRate', width: '90', slot: true}
], ],
//列表 //列表
tableLoading:false, tableLoading:false,
...@@ -119,8 +110,27 @@ export default { ...@@ -119,8 +110,27 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.client-details { .client-details {
::v-deep .client-drawer{ ::v-deep .client-dialog{
width: 80%;
min-width: 900px;
background: #FFFFFF; background: #FFFFFF;
.el-dialog__body{
padding-top: 0;
}
.fixed-table{
.el-table__header-wrapper,.el-table__fixed-header-wrapper{
top: 0;
}
}
.el-dialog__header{
border-bottom: 1px solid #E1E1E1;
}
.el-dialog__title{
font-size: 16px;
color: #232323;
font-weight: bold;
margin-right: 4px;
}
} }
.tip-img{ .tip-img{
width: 14px; width: 14px;
......
dsk-operate-ui/src/views/detail/party-a/dealings/custom.vue
View file @ 3be03b69
...@@ -25,16 +25,19 @@ ...@@ -25,16 +25,19 @@
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.projectUnitId)}`:`/company/${encodeStr(scope.row.projectUnitId)}`" tag="a" class="a-link" v-if="scope.row.projectUnitId&&scope.row.companyName" v-html="scope.row.companyName"></router-link> <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.projectUnitId)}`:`/company/${encodeStr(scope.row.projectUnitId)}`" tag="a" class="a-link" v-if="scope.row.projectUnitId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
<div v-else v-html="scope.row.companyName || '--'"></div> <div v-else v-html="scope.row.companyName || '--'"></div>
</template> </template>
<template slot="projectAllName" slot-scope="scope"> <!-- <template slot="projectAllName" slot-scope="scope">
<router-link :to="`/biddetail/${scope.row.projectInfo.projectId}`" tag="a" class="a-link" v-if="scope.row.projectInfo.projectId&&scope.row.projectInfo.projectAllName" >{{ scope.row.projectInfo.projectAllName }}</router-link> <router-link :to="`/biddetail/${scope.row.projectInfo.projectId}`" tag="a" class="a-link" v-if="scope.row.projectInfo.projectId&&scope.row.projectInfo.projectAllName" >{{ scope.row.projectInfo.projectAllName }}</router-link>
<div v-else v-html="scope.row.projectInfo&&scope.row.projectInfo.projectAllName || '--'"></div> <div v-else v-html="scope.row.projectInfo&&scope.row.projectInfo.projectAllName || '--'"></div>
<div v-if="scope.row.count>1" @click="handleClick($event, scope.row)" style="color: #FF7E38;cursor: pointer;">有{{scope.row.count}}个合作项目/工程 ></div> <div v-if="scope.row.count>1" @click="handleClick($event, scope.row)" style="color: #FF7E38;cursor: pointer;">有{{scope.row.count}}个合作项目/工程 ></div>
</template> -->
<template slot="count" slot-scope="scope">
<div v-if="scope.row.count>0" class="a-link" style="cursor: pointer;" @click="handleClick($event, scope.row)" >{{scope.row.count}}</div>
</template> </template>
</tables> </tables>
<client-detail <client-detail
v-if="isDetails" v-if="isDetails"
:data="rowData" :data="rowData"
:title="'合作项目/工程明细'" :title="title"
:company-id="companyId" :company-id="companyId"
@cancel="isDetails=false" /> @cancel="isDetails=false" />
</div> </div>
...@@ -53,21 +56,23 @@ export default { ...@@ -53,21 +56,23 @@ export default {
}, },
data() { data() {
return { return {
title:'',
queryParams: { queryParams: {
cid: this.companyId, cid: this.companyId,
sort: 3, sort: 3,
pageNum: 1, pageNum: 1,
pageSize: 20 pageSize: 20
}, },
defaultSort: {prop: 'time', order: 'descending'}, defaultSort: {},
forData: [ forData: [
{label: '客户名称', prop: 'companyName', minWidth: '350', slot: true}, {label: '客户名称', prop: 'companyName', minWidth: '350', slot: true},
{label: '合作项目/工程名称', prop: 'projectAllName', minWidth: '400', slot: true, sortable: 'custom', descending: '5', ascending: '6'}, // {label: '合作项目/工程名称', prop: 'projectAllName', minWidth: '400', slot: true, sortable: 'custom', descending: '5', ascending: '6'},
{label: '最近合作时间', prop: 'time', minWidth: '140', sortable: 'custom', descending: '3', ascending: '4'},
{label: '合作总金额（万元）', prop: 'amount', minWidth: '150', sortable: 'custom', descending: '1', ascending: '2'}, {label: '合作总金额（万元）', prop: 'amount', minWidth: '150', sortable: 'custom', descending: '1', ascending: '2'},
{label: '最近一次合作时间', prop: 'time', minWidth: '140', sortable: 'custom', descending: '3', ascending: '4'} {label: '合作次数', prop: 'count', minWidth: '150', sortable: 'custom',slot: true, descending: '5', ascending: '6'},
], ],
formData: [ formData: [
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入企业名称查询', options: []}, { type: 3, fieldName: 'keys', value: '', placeholder: '搜索客户名称', options: []},
], ],
//列表 //列表
tableLoading:false, tableLoading:false,
...@@ -103,7 +108,8 @@ export default { ...@@ -103,7 +108,8 @@ export default {
}, },
handleClick(e, data) { handleClick(e, data) {
this.rowData = data this.rowData = data
this.isDetails = true this.isDetails = true;
this.title = '与客户'+data.companyName+'合作记录'
}, },
handleDetail(row){ handleDetail(row){
if(row.sourceUrl){ if(row.sourceUrl){
......
dsk-operate-ui/src/views/detail/party-a/dealings/hiscontract.vue
View file @ 3be03b69
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 20 pageSize: 20
}, },
defaultSort: {prop: 'winBidTime', order: 'descending'}, defaultSort: {},
forData: [ forData: [
{label: '项目名称', prop: 'projectAllName', minWidth: '560', slot: true}, {label: '项目名称', prop: 'projectAllName', minWidth: '560', slot: true},
{label: '中标时间', prop: 'winBidTime', minWidth: '100', sortable: 'custom', descending: '3', ascending: '4'}, {label: '中标时间', prop: 'winBidTime', minWidth: '100', sortable: 'custom', descending: '3', ascending: '4'},
......
dsk-operate-ui/src/views/detail/party-a/dealings/supplier.vue
View file @ 3be03b69
...@@ -25,16 +25,14 @@ ...@@ -25,16 +25,14 @@
<router-link :to="`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link> <router-link :to="`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
<div v-else v-html="scope.row.companyName || '--'"></div> <div v-else v-html="scope.row.companyName || '--'"></div>
</template> </template>
<template slot="projectAllName" slot-scope="scope"> <template slot="count" slot-scope="scope">
<router-link :to="`/biddetail/${scope.row.projectInfo.projectId}`" tag="a" class="a-link" v-if="scope.row.projectInfo.projectId&&scope.row.projectInfo.projectAllName" >{{ scope.row.projectInfo.projectAllName }}</router-link> <div v-if="scope.row.count>0" class="a-link" style="cursor: pointer;" @click="handleClick($event, scope.row)" >{{scope.row.count}}</div>
<div v-else v-html="scope.row.projectInfo&&scope.row.projectInfo.projectAllName || '--'"></div>
<div v-if="scope.row.count>1" @click="handleClick($event, scope.row)" style="color: #FF7E38;cursor: pointer;">有{{scope.row.count}}个合作项目/工程 ></div>
</template> </template>
</tables> </tables>
<client-detail <client-detail
v-if="isDetails" v-if="isDetails"
:data="rowData" :data="rowData"
:title="'合作项目/工程明细'" :title="title"
:company-id="companyId" :company-id="companyId"
@cancel="isDetails=false" /> @cancel="isDetails=false" />
</div> </div>
...@@ -53,21 +51,22 @@ export default { ...@@ -53,21 +51,22 @@ export default {
}, },
data() { data() {
return { return {
title:'',
queryParams: { queryParams: {
cid: this.companyId, cid: this.companyId,
sort: 3, sort: 5,
pageNum: 1, pageNum: 1,
pageSize: 20 pageSize: 20
}, },
defaultSort: {prop: 'time', order: 'descending'}, defaultSort: {},
forData: [ forData: [
{label: '供应商', prop: 'companyName', minWidth: '350', slot: true}, {label: '供应商', prop: 'companyName', minWidth: '350', slot: true},
{label: '合作项目/工程名称', prop: 'projectAllName', minWidth: '400', slot: true, sortable: 'custom', descending: '5', ascending: '6'}, {label: '最近合作时间', prop: 'time', minWidth: '140', sortable: 'custom', descending: '3', ascending: '4'},
{label: '合作总金额（万元）', prop: 'amount', minWidth: '150', sortable: 'custom', descending: '1', ascending: '2'}, {label: '合作总金额（万元）', prop: 'amount', minWidth: '150', sortable: 'custom', descending: '1', ascending: '2'},
{label: '最近一次合作时间', prop: 'time', minWidth: '140', sortable: 'custom', descending: '3', ascending: '4'} {label: '合作次数', prop: 'count', minWidth: '150', sortable: 'custom',slot: true, descending: '5', ascending: '6'},
], ],
formData: [ formData: [
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入企业名称查询', options: []}, { type: 3, fieldName: 'keys', value: '', placeholder: '搜索供应商名称', options: []},
], ],
//列表 //列表
tableLoading:false, tableLoading:false,
...@@ -104,6 +103,7 @@ export default { ...@@ -104,6 +103,7 @@ export default {
handleClick(e, data) { handleClick(e, data) {
this.rowData = data this.rowData = data
this.isDetails = true this.isDetails = true
this.title = '与供应商'+data.companyName+'合作记录'
}, },
handleDetail(row){ handleDetail(row){
if(row.sourceUrl){ if(row.sourceUrl){
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 3be03b69
<template> <template>
<div> <div >
<div class="content"> <div class="content">
<div class="content_item"> <div class="content_item">
<div class="content_right item_ckquery_list"> <div class="content_right item_ckquery_list">
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
<p v-else class="renling-img-false"> <p v-else class="renling-img-false">
</p> </p>
<span v-if="scope.row.claimStatus==0" @click="cancelClaim(scope.row.companyName)" class="renling-hui"> <span v-if="scope.row.claimStatus==0" @click="cancelClaim(scope.row.companyName,scope.$index)" class="renling-hui">
已认领 已认领
</span> </span>
<span v-else class="renling-hei"> <span v-else class="renling-hei">
...@@ -567,6 +567,7 @@ export default { ...@@ -567,6 +567,7 @@ export default {
], ],
companyId:'', companyId:'',
companyName:'', companyName:'',
cancelIndex:'',
customerId:'', customerId:'',
dialogVisible: false, dialogVisible: false,
dialogVisible1: false, dialogVisible1: false,
...@@ -848,15 +849,16 @@ export default { ...@@ -848,15 +849,16 @@ export default {
}); });
}, },
cancelClaim(companyName){ cancelClaim(companyName,index){
this.dialogVisible1 = true; this.dialogVisible1 = true;
this.companyName = companyName; this.companyName = companyName;
this.cancelIndex = index;
}, },
confirm(){ confirm(){
api.cancelClaim(this.companyName).then(res=>{ api.cancelClaim(this.companyName).then(res=>{
if(res.code==200){ if(res.code==200){
this.dialogVisible1 = false; this.dialogVisible1 = false;
this.search(); this.tableData[this.cancelIndex].claimStatus = 1
}else{ }else{
this.$message.error(res.msg) this.$message.error(res.msg)
} }
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ 3be03b69
<template> <template>
<div >
<div>
<div class="content"> <div class="content">
<div class="content_item content_item_padding0"> <div class="content_item content_item_padding0">
<div class="content_right item_ckquery_list"> <div class="content_right item_ckquery_list">
......
dsk-operate-ui/src/views/enterpriseData/index.vue
View file @ 3be03b69
<template> <template>
<div class="app-container"> <div class="app-container nationalEconomies">
<div class="content"> <div class="content">
<div class="combined-title"> <div class="combined-title">
<div class="title-right"> <div class="title-right">
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div style="position:relative" v-for="(itme,i) in personnelList" <div style="position:relative" v-for="(itme,i) in personnelList"
:class="itme.status==true?'active':'' " :key='i' @click="personnelListbtn(i)"> :class="itme.status==true?'active':'' " :key='i' @click="personnelListbtn(i)">
<p>{{itme.value}}</p> <p>{{itme.value}}</p>
<img v-if="i==1" style="position: absolute;top:-10px;width:80px;height:16px;" src="@/assets/images/owner/tip.png" alt=""> <img v-if="i==1" style="position: relative;top:-10px;width:80px;height:16px;" src="@/assets/images/owner/tip.png" alt="">
</div> </div>
</div> </div>
...@@ -15,10 +15,27 @@ ...@@ -15,10 +15,27 @@
</div> </div>
<p class="solid"></p> <p class="solid"></p>
</div> </div>
<!-- <div class="header">
<el-tabs tab-position="left" v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="查城投平台" name="first"></el-tab-pane>
<el-tab-pane name="second">
<span slot="label"><img style="position: absolute;top:-10px;width:80px;height:16px;right:0;" src="@/assets/images/owner/tip.png" alt="">查企业</span>
</el-tab-pane>
<el-tab-pane label="查集团户" name="third"></el-tab-pane>
</el-tabs>
</div> -->
<!-- 查业主单位 -->
<!-- <Owner v-if="activeName === 'first'" /> -->
<!-- 查企业 -->
<!-- <SearchEnterprise v-if="activeName === 'second'" /> -->
<!-- 查集团户 -->
<!-- <Group v-if="activeName === 'third'" /> -->
<!-- 查业主单位 --> <!-- 查业主单位 -->
<Owner v-if="personnelHerf=='Owner'" /> <Owner v-if="personnelHerf=='Owner'" />
<!-- 查企业 --> <!-- 查企业 -->
<SearchEnterprise v-if="personnelHerf=='SearchEnterprise'" /> <SearchEnterprise v-if="personnelHerf=='SearchEnterprise'" />
<!-- 查企业 -->
<Group v-if="personnelHerf=='Group'" />
...@@ -28,14 +45,16 @@ ...@@ -28,14 +45,16 @@
<script> <script>
import SearchEnterprise from "./components/SearchEnterprise/index.vue"; import SearchEnterprise from "./components/SearchEnterprise/index.vue";
import Owner from "./components/Owner/index.vue"; import Owner from "./components/Owner/index.vue";
import Group from "./components/Group/index.vue";
import "@/assets/styles/public.css"; import "@/assets/styles/public.css";
export default { export default {
name: 'EnterpriseData', name: 'EnterpriseData',
components: { SearchEnterprise,Owner }, components: { SearchEnterprise,Owner,Group },
data() { data() {
return { return {
activeName:'first',
// tablist // tablist
personnelList: [{ personnelList: [{
key: 'Owner', key: 'Owner',
...@@ -47,6 +66,11 @@ ...@@ -47,6 +66,11 @@
status: false, status: false,
value: '查企业', value: '查企业',
}, },
{
key: 'Group',
status: false,
value: '查集团户',
},
], ],
...@@ -55,6 +79,7 @@ ...@@ -55,6 +79,7 @@
}, },
created() {}, created() {},
methods: { methods: {
handleClick(){},
personnelListbtn(index) { personnelListbtn(index) {
for (var i = 0; i < this.personnelList.length; i++) { for (var i = 0; i < this.personnelList.length; i++) {
this.personnelList[i].status = false; this.personnelList[i].status = false;
...@@ -71,7 +96,49 @@ ...@@ -71,7 +96,49 @@
.app-container { .app-container {
margin: 12px 24px; margin: 12px 24px;
padding: 0; padding: 0;
// display: flex;
} }
// .header{
// justify-content: space-between;
// background: #FFFFFF;
// border-radius: 4px;
// color: #232323;
// margin-right: 12px;
// ::v-deep .el-tabs{
// .el-tabs__nav-wrap::after {
// position: static !important;
// }
// .el-tabs__header{
// margin: 0;
// .el-tabs__item{
// padding: 0 16px;
// font-size: 16px;
// text-align: left;
// }
// .is-active{
// font-weight: bold;
// }
// }
// .el-tabs__content{
// width: 100%;
// }
// #tab-second{
// // margin-top: 10px;
// }
// }
// ::v-deep .el-tabs--left{
// overflow: inherit;
// }
// .location{
// font-size: 14px;
// color: #0081FF;
// i{
// margin-right: 6px;
// font-size: 16px;
// }
// }
// }
.content{ .content{
padding: 0px 16px; padding: 0px 16px;
background: #FFFFFF; background: #FFFFFF;
...@@ -135,7 +202,6 @@ ...@@ -135,7 +202,6 @@
left: 0; left: 0;
z-index: 1; z-index: 1;
} }
.tab { .tab {
display: flex; display: flex;
z-index: 2; z-index: 2;
......
dsk-operate-ui/src/views/project/projectList/component/gjjl.vue
View file @ 3be03b69
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="writting" v-if="isEdit == true" :class="{'w836':showtype!='gjjl'}"> <div class="writting" v-if="isEdit == true" :class="{'w836':showtype!='gjjl'}">
<div class="wri_top"> <div class="wri_top">
<img src="@/assets/images/project/add_3.png"> <img src="@/assets/images/project/add_3.png">
<el-input v-model="addParam.content" placeholder="新建一条跟进记录，如:周五上午预约客户上门拜访"></el-input> <el-input type="textarea" autosize resize="none" v-model="addParam.content" placeholder="新建一条跟进记录，如:周五上午预约客户上门拜访"></el-input>
</div> </div>
<div class="wr_bot"> <div class="wr_bot">
<div class="sels"> <div class="sels">
......
dsk-operate-ui/src/views/radar/debtProject/details.vue
View file @ 3be03b69
...@@ -102,7 +102,10 @@ ...@@ -102,7 +102,10 @@
<div class="common-title">项目当事人</div> <div class="common-title">项目当事人</div>
<div class="main4-box"> <div class="main4-box">
<label class="label">项目主体</label> <label class="label">项目主体</label>
<span>{{details.projectEntity || '-'}}</span> <span>
<router-link v-if="details.projectEntity" :to="details.projectEntityUipId?'/enterprise/' + encodeStr(details.projectEntityId) :'/company/' + encodeStr(details.projectEntityId) " tag="a" class="list-titel-a blue" v-html="details.projectEntity"></router-link>
<template v-else>--</template>
</span>
<label class="label">主管部门</label> <label class="label">主管部门</label>
<span>{{details.chargeDepartment || '-'}}</span> <span>{{details.chargeDepartment || '-'}}</span>
<label class="label">实施单位</label> <label class="label">实施单位</label>
...@@ -140,11 +143,13 @@ ...@@ -140,11 +143,13 @@
<script> <script>
import { details,bondPage } from '@/api/macro/macro' import { details,bondPage } from '@/api/macro/macro'
import {encodeStr} from "@/assets/js/common.js"
export default { export default {
name: 'debtProjectDetails', name: 'debtProjectDetails',
data() { data() {
return { return {
id:'', id:'',
encodeStr,
tableData:[], tableData:[],
details:{}, details:{},
tableLoading: false, tableLoading: false,
...@@ -195,6 +200,9 @@ ...@@ -195,6 +200,9 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.app-container{ .app-container{
padding: 0; padding: 0;
.list-titel-a{
color:#0081FF;
}
} }
.qyzx-details{ .qyzx-details{
.tab{ .tab{
......
dsk-system/src/main/java/com/dsk/system/dskService/JskCombineInfoService.java
View file @ 3be03b69
...@@ -127,6 +127,11 @@ public class JskCombineInfoService { ...@@ -127,6 +127,11 @@ public class JskCombineInfoService {
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
public AjaxResult centralEnterprseLocalPage(JSONObject object) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/local/page", object);
return BeanUtil.toBean(map, AjaxResult.class);
}
public AjaxResult centralEnterprseSocial() { public AjaxResult centralEnterprseSocial() {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/social", null); Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/social", null);
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
......
dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java
View file @ 3be03b69
...@@ -54,7 +54,7 @@ public class EconomicServiceImpl implements EconomicService { ...@@ -54,7 +54,7 @@ public class EconomicServiceImpl implements EconomicService {
if (ObjectUtil.isEmpty(dto.getYear())) { if (ObjectUtil.isEmpty(dto.getYear())) {
dto.setYear(DateUtils.getYear() - 1); dto.setYear(DateUtils.getYear() - 1);
} }
Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/national/nationalPage", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/national/nationalPage", BeanUtil.beanToMap(dto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300); Integer code = MapUtils.getInteger(map, "code", 300);
if (!code.equals(HttpStatus.OK.value())) { if (!code.equals(HttpStatus.OK.value())) {
throw new RuntimeException(); throw new RuntimeException();
...@@ -64,13 +64,13 @@ public class EconomicServiceImpl implements EconomicService { ...@@ -64,13 +64,13 @@ public class EconomicServiceImpl implements EconomicService {
@Override @Override
public AjaxResult yearsList(OpRegionalEconomicDataYearsListDto dto) { public AjaxResult yearsList(OpRegionalEconomicDataYearsListDto dto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/years/list", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/years/list", BeanUtil.beanToMap(dto, false, false));
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
@Override @Override
public AjaxResult details(OpRegionalEconomicDataDetailsDto detailsDto) { public AjaxResult details(OpRegionalEconomicDataDetailsDto detailsDto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/details", BeanUtil.beanToMap(detailsDto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/details", BeanUtil.beanToMap(detailsDto, false, false));
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
...@@ -87,7 +87,7 @@ public class EconomicServiceImpl implements EconomicService { ...@@ -87,7 +87,7 @@ public class EconomicServiceImpl implements EconomicService {
} }
} }
Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/location", BeanUtil.beanToMap(detailsDto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/location", BeanUtil.beanToMap(detailsDto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300); Integer code = MapUtils.getInteger(map, "code", 300);
if (!code.equals(HttpStatus.OK.value())) { if (!code.equals(HttpStatus.OK.value())) {
throw new RuntimeException(); throw new RuntimeException();
...@@ -102,25 +102,25 @@ public class EconomicServiceImpl implements EconomicService { ...@@ -102,25 +102,25 @@ public class EconomicServiceImpl implements EconomicService {
@Override @Override
public AjaxResult statisticsRegional(OpRegionalEconomicDataStatisticsRegionalDto dto) { public AjaxResult statisticsRegional(OpRegionalEconomicDataStatisticsRegionalDto dto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/statistics/regional", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/statistics/regional", BeanUtil.beanToMap(dto, false, false));
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
@Override @Override
public AjaxResult regionalList(OpRegionalEconomicDataRegionalListDto dto) { public AjaxResult regionalList(OpRegionalEconomicDataRegionalListDto dto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/regional/list", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/regional/list", BeanUtil.beanToMap(dto, false, false));
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
@Override @Override
public AjaxResult regionalCompare(OpRegionalEconomicDataStatisticsRegionalDto dto) { public AjaxResult regionalCompare(OpRegionalEconomicDataStatisticsRegionalDto dto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/regional/compare", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/regional/compare", BeanUtil.beanToMap(dto, false, false));
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
@Override @Override
public AjaxResult regionalMultipleCompare(OpRegionalEconomicRegionalCompareDto dto) { public AjaxResult regionalMultipleCompare(OpRegionalEconomicRegionalCompareDto dto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/regional/multipleCompare", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/regional/multipleCompare", BeanUtil.beanToMap(dto, false, false));
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
......
dsk-system/src/main/java/com/dsk/system/service/impl/SpecialPurposeBondsServiceImpl.java
View file @ 3be03b69
...@@ -35,7 +35,7 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic ...@@ -35,7 +35,7 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
@Override @Override
public AjaxResult page(SpecialPurposeBondsPageDto dto) { public AjaxResult page(SpecialPurposeBondsPageDto dto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/projects/page", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/specialPurposeBonds/projects/page", BeanUtil.beanToMap(dto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300); Integer code = MapUtils.getInteger(map, "code", 300);
if (code.equals(HttpStatus.OK.value())) { if (code.equals(HttpStatus.OK.value())) {
Map data = MapUtils.getMap(map, "data", null); Map data = MapUtils.getMap(map, "data", null);
...@@ -60,7 +60,7 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic ...@@ -60,7 +60,7 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
@Override @Override
public AjaxResult details(SpecialBondInformationDetailsDto detailsDto) { public AjaxResult details(SpecialBondInformationDetailsDto detailsDto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/details", BeanUtil.beanToMap(detailsDto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/specialPurposeBonds/details", BeanUtil.beanToMap(detailsDto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300); Integer code = MapUtils.getInteger(map, "code", 300);
if (code.equals(HttpStatus.OK.value())) { if (code.equals(HttpStatus.OK.value())) {
Map projectMap = MapUtils.getMap(map, "data", null); Map projectMap = MapUtils.getMap(map, "data", null);
...@@ -100,7 +100,7 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic ...@@ -100,7 +100,7 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
@Override @Override
public AjaxResult bondStatistics(SpecialPurposeBondsDto dto) { public AjaxResult bondStatistics(SpecialPurposeBondsDto dto) {
// todo 临时处理 待还原 // todo 临时处理 待还原
Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/bond/statistics", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/specialPurposeBonds/bond/statistics", BeanUtil.beanToMap(dto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300); Integer code = MapUtils.getInteger(map, "code", 300);
if (code.equals(HttpStatus.OK.value())) { if (code.equals(HttpStatus.OK.value())) {
List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(map, "data", "")); List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(map, "data", ""));
...@@ -119,7 +119,7 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic ...@@ -119,7 +119,7 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
@Override @Override
public AjaxResult bondPage(SpecialBondInformationPageDto pageDto) { public AjaxResult bondPage(SpecialBondInformationPageDto pageDto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/bond/page", BeanUtil.beanToMap(pageDto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/specialPurposeBonds/bond/page", BeanUtil.beanToMap(pageDto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300); Integer code = MapUtils.getInteger(map, "code", 300);
if (code.equals(HttpStatus.OK.value())) { if (code.equals(HttpStatus.OK.value())) {
Map data = MapUtils.getMap(map, "data", null); Map data = MapUtils.getMap(map, "data", null);
......
dsk-system/src/main/java/com/dsk/system/service/impl/UrbanInvestmentPlatformServiceImpl.java
View file @ 3be03b69
...@@ -36,7 +36,7 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo ...@@ -36,7 +36,7 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
@Override @Override
public AjaxResult page(UrbanInvestmentPlatformDto pageDto) { public AjaxResult page(UrbanInvestmentPlatformDto pageDto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/urbanInvestment/page", BeanUtil.beanToMap(pageDto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/urbanInvestment/page", BeanUtil.beanToMap(pageDto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300); Integer code = MapUtils.getInteger(map, "code", 300);
if (HttpStatus.OK.value() != code) { if (HttpStatus.OK.value() != code) {
throw new RuntimeException(); throw new RuntimeException();
...@@ -64,7 +64,7 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo ...@@ -64,7 +64,7 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
Map<String, Object> bondCreditRatingBatchMap = new HashMap<>(1); Map<String, Object> bondCreditRatingBatchMap = new HashMap<>(1);
bondCreditRatingBatchMap.put("cIds", cIds); bondCreditRatingBatchMap.put("cIds", cIds);
Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRatingBatch", bondCreditRatingBatchMap); Map<String, Object> bondCreditRatingMap = dskOpenApiUtil.requestBody("/operate/operate/enterprise/bondCreditRatingBatch", bondCreditRatingBatchMap);
Integer codeRating = MapUtils.getInteger(bondCreditRatingMap, "code", 300); Integer codeRating = MapUtils.getInteger(bondCreditRatingMap, "code", 300);
ArrayList<Map<String, Object>> objArrayList = new ArrayList(1); ArrayList<Map<String, Object>> objArrayList = new ArrayList(1);
if (codeRating.equals(HttpStatus.OK.value())) { if (codeRating.equals(HttpStatus.OK.value())) {
...@@ -115,13 +115,13 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo ...@@ -115,13 +115,13 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
public AjaxResult details(String id) { public AjaxResult details(String id) {
Map<String, Object> bodyMap = new HashMap<>(1); Map<String, Object> bodyMap = new HashMap<>(1);
bodyMap.put("id", id); bodyMap.put("id", id);
Map<String, Object> map = dskOpenApiUtil.requestBody("/urbanInvestment/details", bodyMap); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/urbanInvestment/details", bodyMap);
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
@Override @Override
public AjaxResult statistics(UrbanInvestmentPlatformDto dto) { public AjaxResult statistics(UrbanInvestmentPlatformDto dto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/urbanInvestment/statistics", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/urbanInvestment/statistics", BeanUtil.beanToMap(dto, false, false));
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