Skip to content

D
dsk-cr20g
Commit 45996241 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 2984443c e41ae7a1
Hide whitespace changes
Inline Side-by-side
Showing with 620 additions and 116 deletions
dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessInfoController.java
View file @ 45996241
...@@ -90,7 +90,7 @@ public class BusinessInfoController extends BaseController ...@@ -90,7 +90,7 @@ public class BusinessInfoController extends BaseController
/** /**
* 新增项目详情 * 新增项目详情
*/ */
// @PreAuthorize("@ss.hasPermi('system:business:add')") // @PreAuthorize("@ss.hasPermi('system:business:add')")Z
// @Log(title = "项目管理", businessType = BusinessType.INSERT) // @Log(title = "项目管理", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
public AjaxResult add(@RequestBody BusinessAddDto dto) public AjaxResult add(@RequestBody BusinessAddDto dto)
......
dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessRelateCompany.java
View file @ 45996241
...@@ -54,36 +54,6 @@ public class BusinessRelateCompany extends BaseEntity ...@@ -54,36 +54,6 @@ public class BusinessRelateCompany extends BaseEntity
@Excel(name = "对接深度/竞争力度") @Excel(name = "对接深度/竞争力度")
private String depth; private String depth;
/** 企业类型 */ /** 是否业主单位 0：否 1：是 */
@Excel(name = "企业类型") private Integer isProprietor;
private String companyType;
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("businessId", getBusinessId())
.append("companyId", getCompanyId())
.append("companyName", getCompanyName())
.append("companyRole", getCompanyRole())
.append("responsiblePerson", getResponsiblePerson())
.append("phone", getPhone())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("depth", getDepth())
.append("companyType", getCompanyType())
.append("companyUipId", getCompanyUipId())
.toString();
}
public BusinessRelateCompany(Integer businessId, Integer companyId, String companyName, String companyRole) {
this.businessId = businessId;
this.companyId = companyId;
this.companyName = companyName;
this.companyRole = companyRole;
}
public BusinessRelateCompany(Integer businessId) {
this.businessId = businessId;
}
} }
dsk-operate-ui/src/api/detail/party-a/biddetail.js 0 → 100644
View file @ 45996241
import request from "@/utils/request";
// 投标记录列表
export function getBiddetail(data) {
return request({
url: '/enterpriseBussiness/projectDetail',
method: 'post',
data: data
})
}
\ No newline at end of file
dsk-operate-ui/src/router/index.js
View file @ 45996241
...@@ -145,6 +145,20 @@ export const constantRoutes = [ ...@@ -145,6 +145,20 @@ export const constantRoutes = [
} }
] ]
}, },
{
path: '/biddetail',
component: Layout,
hidden: true,
redirect: 'noredirect',
children: [
{
path: '/biddetail/:id(\\d+)',
component: () => import('@/views/detail//biddetail/index'),
name: 'Biddetail',
meta: { title: '中标业绩详情'}
}
]
},
{ {
path: '/financing', path: '/financing',
component: Layout, component: Layout,
......
dsk-operate-ui/src/views/detail/biddetail/index.vue 0 → 100644
View file @ 45996241
<template>
<div class="app-container qyzx-details">
<div class="bottomlist">
<ul class="bottomlist-content">
<li class="bottomlist-list" >
<p class="list-titel">
{{info.projectAllName}}
</p>
<div class="list-content" v-if="info.winBidTime">
<p class="list-content-text" >
<span>中标时间：</span>
<span >{{info.winBidTime}}</span>
</p>
</div>
<div class="list-content-img" @mouseenter="showimg=false" @mouseleave="showimg=true">
<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
<img v-else src="@/assets/images/bxpro/original.png">
<span>
<a :href="info.sourceUrl" target="_blank">原文链接</a>
</span>
</div>
</li>
</ul>
</div>
<div class="content main3">
<div class="common-title">信息详情</div>
<div class="biddetail-title">中标信息</div>
<div class="main31-box">
<p>
<label class="label">中标企业</label>
<span>
<router-link v-if="info.companyName" :to="info.uipId?'/enterprise/' + encodeStr(info.companyId) :'/company/' + encodeStr(info.companyId) " tag="a" class="list-titel-a blue" v-html="info.companyName"></router-link>
<span v-else>--</span>
</span>
<label class="label">中标时间</label>
<span>{{info.winBidTime||"--"}}</span>
<label class="label">中标金额（万）</label>
<span>{{info.winBidAmount||"--"}}</span>
</p>
<p>
<label class="label">项目负责人</label>
<span>{{info.staffName||"--"}}</span>
<label class="label">中标地区</label>
<span>{{info.region||"--"}}</span>
<label class="label">项目类型</label>
<span>{{info.projectTypeNew||"--"}}</span>
</p>
<p>
<label class="label">工期（天）</label>
<span>{{info.period||"--"}}</span>
<label class="label">下浮率</label>
<span>{{info.lowerRate||"--"}}</span>
<label class="label">建设性质</label>
<span>{{info.projectNature||"--"}}</span>
</p>
</div>
<div class="biddetail-title">招标信息</div>
<div class="main31-box">
<p>
<label class="label">招标单位</label>
<span class="span1">
<router-link v-if="info.projectUnit" :to="info.uipId?'/enterprise/' + encodeStr(info.projectUnitId) :'/company/' + encodeStr(info.projectUnitId) " tag="a" class="list-titel-a blue" v-html="info.projectUnit"></router-link>
<span v-else>--</span>
</span>
<label class="label label1">招标代理机构</label>
<span class="span1">{{info.agency||"--"}}</span>
</p>
</div>
<div class="tip">
<span>温馨提示：</span>本栏信息全部来自政府建设主管单位，可作为该公司资质电报、招标投标业绩核实、优质工程（奖杯)申请、信用评估等用途使用。
</div>
</div>
<div class="content main3">
<div class="common-title">信息快照</div>
<div class="main3-box" >
<img class="tip-img" :src="'https://imgs.jiansheku.com/'+info.snapshootPic" v-if="info.snapshootPic" />
<div v-else class="no-data">
<div class="no-data-box" >
<img :src="noData" alt="暂时没有找到相关数据" />
<span>暂时没有找到相关数据</span>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import "@/assets/styles/public.css";
import {encodeStr} from "@/assets/js/common.js"
import {getBiddetail} from '@/api/detail/party-a/biddetail.js';
export default {
name: 'Biddetail',
data() {
return {
encodeStr,
id: '',
info:{},
showimg:true,
noData: require("@/assets/images/detail/noData.png")
}
},
created() {
this.id = this.$route.params.id;
this.biddetail();
},
methods:{
biddetail(){
getBiddetail({
id: this.id
}).then(res => {
if(res.code==200){
this.info = res.data
}
}).catch(error => {
});
}
}
}
</script>
<style lang="scss" scoped>
.bottomlist {
width: 100%;
background-color: #FFFFFF;
border-radius: 4px 4px 4px 4px;
.bottomlist-title {
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 12px;
padding: 16px;
border-bottom: 1px solid #EFEFEF;
.title-right {
display: flex;
align-items: center;
p:first-child {
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child {
display: flex;
align-items: center;
font-size: 14px;
font-weight: 400;
color: rgba(35, 35, 35, 0.8);
}
img {
width: 18px;
height: 18px;
}
}
}
.bottomlist-content {
padding-bottom: 0px;
}
.bottomlist-list {
padding: 16px;
font-size: 14px;
border-bottom: 1px solid #EFEFEF;
padding-bottom: 14px;
.list-titel {
font-size: 16px;
font-weight: 700;
color: #3D3D3D;
line-height: 19px;
.list-titel-a {
text-decoration: none;
color: #3D3D3D;
}
a:hover,
a:visited,
a:link,
a:active {
color: #3D3D3D;
}
}
.content-label {
margin-top: 12px;
.list-label {
background: #F3F3FF;
color: #8491E8;
border-radius: 1px 1px 1px 1px;
margin-right: 12px;
padding: 3px 7px;
font-size: 12px;
}
.list-label-zb{
font-weight: 400;
color: #5A88F9;
background: #E7EDFC;
}
.list-label-lx{
font-weight: 400;
color: #41A1FD;
background: #E4F3FD;
}
}
.list-content {
margin-top: 6px;
display: flex;
justify-content: start;
align-items: center;
.list-content-text {
margin-top: 7px;
display: flex;
justify-content: start;
align-items: center;
margin-right: 27px;
font-size: 14px;
span:first-child {
font-weight: 400;
color: rgba(35, 35, 35, 0.4);
line-height: 15px
}
span:last-child {
font-weight: 400;
color: rgba(35, 35, 35, 0.8);
line-height: 15px
}
.blue {
color: #0081FF !important;
cursor: pointer;
}
}
}
.list-addree {
width: auto;
background: #F3F4F5;
display: inline-flex;
margin-top: 7px;
.list-content-text {
margin-top: 0px;
span {
line-height: 30px !important;
}
}
img {
width: 14px;
margin: 0 8px;
}
}
.list-content-img{
position: absolute;
top: 16px;
right:40px ;
color: #0081FF;
display: flex;
align-items: center;
font-size: 14px;
cursor: pointer;
img{
width: 14px;
height: 14px;
margin-right: 4px;
}
}
.list-content-img:hover{
color: #0067CC;
}
}
.bottomlist-list:hover {
background: #F6F9FC;
cursor: pointer;
}
.pagination {
padding: 14px;
.el-pagination {
float: right;
}
}
}
.app-container {
padding: 0;
}
.qyzx-details {
.content {
margin-top: 16px;
background: #FFFFFF;
padding: 16px;
border-radius: 4px;
}
.common-title {
margin-bottom: 16px;
}
.biddetail-title{
color: #232323;
font-size: 14px;
height: 14px;
line-height: 14px;
margin-top: 8px;
}
.tip{
font-size: 12px;
color: rgba(35, 35, 35, 0.80);
span{
color: rgba(35, 35, 35, 0.40);
}
}
.main3 {
position: relative;
.main3-box {
margin-top: 22px;
min-height: 400px;
border: 1px solid #D8D8D8;
img{
width: 100%;
}
.no-data {
font-size: 14px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #999999;
width: 100%;
height: 400px;
display: flex;
justify-content: center;
align-items: center;
background: #ffffff;
.no-data-box {
display: flex;
flex-direction: column;
align-items: center;
img {
width: 64px;
height: 79px;
margin-bottom: 16px;
}
}
}
}
.main31-box {
margin-top: 16px;
margin-bottom: 16px;
border-top: 1px solid #E6E9F0;
p {
display: flex;
align-items: center;
margin: 0;
border-left: 1px solid #E6E9F0;
border-right: 1px solid #E6E9F0;
border-bottom: 1px solid #E6E9F0;
background: #F0F3FA;
.label {
width: 11.1%;
height: 100%;
font-weight: 400;
line-height: 22px;
font-size: 12px;
padding: 9px 12px;
}
.label1{
width: 10%;
}
span {
width: 22.3%;
color: #000;
line-height: 22px;
padding: 9px 12px;
font-size: 12px;
background: #fff;
}
.span1{
width: 40%;
}
.span-one {
width: 90%;
}
.blue {
color: #0081FF !important;
cursor: pointer;
}
}
}
}
}
</style>
\ No newline at end of file
dsk-operate-ui/src/views/detail/party-a/component/CustomMoneySelect.vue
View file @ 45996241
...@@ -242,7 +242,7 @@ export default { ...@@ -242,7 +242,7 @@ export default {
border: 1px solid #E4E7ED; border: 1px solid #E4E7ED;
padding: 6px 0; padding: 6px 0;
border-radius: 4px; border-radius: 4px;
z-index: 9; z-index: 10;
// .arrow { // .arrow {
......
dsk-operate-ui/src/views/detail/party-a/component/CustomTimeSelect.vue
View file @ 45996241
...@@ -272,7 +272,7 @@ export default { ...@@ -272,7 +272,7 @@ export default {
border: 1px solid #E4E7ED; border: 1px solid #E4E7ED;
padding: 6px 0; padding: 6px 0;
border-radius: 4px; border-radius: 4px;
z-index: 9; z-index: 10;
.option { .option {
padding: 0 24px 0 16px; padding: 0 24px 0 16px;
......
dsk-operate-ui/src/views/detail/party-a/dealings/component/customDetail.vue
View file @ 45996241
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
<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)"/> <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="handlePic(scope.row.sourceUrl)" v-if="scope.row.sourceUrl&&scope.row.projectAllName" v-html="scope.row.projectAllName" 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>
<!-- <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>-->
<span v-else v-html="scope.row.projectAllName || '--'"></span> <span v-else v-html="scope.row.projectAllName || '--'"></span>
</div> </div>
</template> </template>
...@@ -108,6 +107,10 @@ export default { ...@@ -108,6 +107,10 @@ export default {
window.open(url, "_blank") window.open(url, "_blank")
} }
}, },
linkTo(scope){
this.drawer = false
this.$router.push(`/biddetail/${scope.row.id}`)
},
cancel() { cancel() {
this.$emit('cancel') this.$emit('cancel')
} }
......
dsk-operate-ui/src/views/detail/party-a/dealings/component/supplierDetail.vue
View file @ 45996241
...@@ -27,9 +27,7 @@ ...@@ -27,9 +27,7 @@
<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)"/> <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="handlePic(scope.row.sourceUrl)" v-if="scope.row.sourceUrl&&scope.row.projectAllName" v-html="scope.row.projectAllName" 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.projectAllName || '--'"></span>
<!-- <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>-->
<span v-else v-html="scope.row.projectAllName || '--'"></span>
</div> </div>
</template> </template>
<template slot="province" slot-scope="scope"> <template slot="province" slot-scope="scope">
...@@ -108,6 +106,10 @@ export default { ...@@ -108,6 +106,10 @@ export default {
window.open(url, "_blank") window.open(url, "_blank")
} }
}, },
linkTo(scope){
this.drawer = false
this.$router.push(`/biddetail/${scope.row.id}`)
},
cancel() { cancel() {
this.$emit('cancel') this.$emit('cancel')
} }
......
dsk-operate-ui/src/views/detail/party-a/dealings/custom.vue
View file @ 45996241
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
<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">
<div class="a-link" @click="handleDetail(scope.row.projectInfo)" v-if="scope.row.projectInfo&&scope.row.projectInfo.sourceUrl&&scope.row.projectInfo.projectAllName" v-html="scope.row.projectInfo.projectAllName" style="cursor: pointer"></div> <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="" tag="a" class="a-link" v-if="scope.row.projectInfo.projectId&&scope.row.projectInfo.projectAllName" v-html="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>
...@@ -105,6 +104,7 @@ export default { ...@@ -105,6 +104,7 @@ export default {
}, },
handleDetail(row){ handleDetail(row){
if(row.sourceUrl){ if(row.sourceUrl){
window.open(row.sourceUrl, "_blank") window.open(row.sourceUrl, "_blank")
} }
} }
......
dsk-operate-ui/src/views/detail/party-a/dealings/hiscontract.vue
View file @ 45996241
...@@ -21,9 +21,8 @@ ...@@ -21,9 +21,8 @@
@sort-change="sortChange" @sort-change="sortChange"
> >
<template slot="projectAllName" slot-scope="scope"> <template slot="projectAllName" slot-scope="scope">
<div class="a-link" @click="handleDetail(scope.row)" v-if="scope.row.sourceUrl&&scope.row.projectAllName" v-html="scope.row.projectAllName" style="cursor: pointer"></div> <router-link :to="`/biddetail/${scope.row.id}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName" >{{ scope.row.projectAllName }}</router-link>
<!-- <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName " v-html="scope.row.projectAllName"></router-link>--> <div v-else v-html="scope.row&&scope.row.projectAllName || '--'"></div>
<div v-else v-html="scope.row.projectAllName || '--'"></div>
</template> </template>
<template slot="companyName" slot-scope="scope"> <template slot="companyName" slot-scope="scope">
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName">{{ scope.row.companyName }}</router-link> <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName">{{ scope.row.companyName }}</router-link>
......
dsk-operate-ui/src/views/detail/party-a/dealings/supplier.vue
View file @ 45996241
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
<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">
<div class="a-link" @click="handleDetail(scope.row.projectInfo)" v-if="scope.row.projectInfo&&scope.row.projectInfo.sourceUrl&&scope.row.projectInfo.projectAllName" v-html="scope.row.projectInfo.projectAllName" style="cursor: pointer"></div> <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="" tag="a" class="a-link" v-if="scope.row.projectInfo.projectId&&scope.row.projectInfo.projectAllName" v-html="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>
......
dsk-operate-ui/src/views/detail/party-a/opport/landtransaction.vue
View file @ 45996241
...@@ -92,6 +92,11 @@ export default { ...@@ -92,6 +92,11 @@ export default {
this.tableLoading = false this.tableLoading = false
if(res.code==200){ if(res.code==200){
this.tableData = res.rows this.tableData = res.rows
if(this.tableData.length>0){
this.tableData.map(item=>{
item.transactionPrice==0&&(item.transactionPrice = '--')
})
}
} }
this.tableDataTotal = res.total this.tableDataTotal = res.total
} }
......
dsk-operate-ui/src/views/detail/party-a/opport/proposed.vue
View file @ 45996241
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
], ],
formData: [ formData: [
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220}, { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
{ type: 4, fieldName: 'isProjcet', value: '', placeholder: '是否为民间推介项目', options: []}, { type: 1, fieldName: 'isProject', value: '', placeholder: '是否为民间推介项目', options: [{name:'不限',value:null},{name:'是',value:'1'},{name:'否',value:'0'}],width: 180},
], ],
//列表 //列表
tableLoading:false, tableLoading:false,
......
dsk-operate-ui/src/views/detail/party-a/overview/component/bidding.vue
View file @ 45996241
...@@ -166,7 +166,7 @@ export default { ...@@ -166,7 +166,7 @@ export default {
} }
}, },
grid:{ grid:{
left:'1%', left:'5%',
top:'8%', top:'8%',
right:'5%', right:'5%',
bottom:'8%', bottom:'8%',
......
dsk-operate-ui/src/views/detail/party-a/overview/component/finance.vue
View file @ 45996241
...@@ -33,21 +33,25 @@ ...@@ -33,21 +33,25 @@
prop="operatingIncome" prop="operatingIncome"
align="right" align="right"
label="营业收入（亿）"> label="营业收入（亿）">
<template slot-scope="scope">{{ scope.row.operatingIncome==0||!scope.row.operatingIncome?'--':scope.row.operatingIncome }}</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="netProfit" prop="netProfit"
align="right" align="right"
label="净利润（亿）"> label="净利润（亿）">
<template slot-scope="scope">{{ scope.row.netProfit==0||!scope.row.netProfit?'--':scope.row.netProfit }}</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="totalAssets" prop="totalAssets"
align="right" align="right"
label="总资产（亿）"> label="总资产（亿）">
<template slot-scope="scope">{{ scope.row.totalAssets==0||!scope.row.totalAssets?'--':scope.row.totalAssets }}</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="netAssets" prop="netAssets"
align="right" align="right"
label="净资产（亿）"> label="净资产（亿）">
<template slot-scope="scope">{{ scope.row.netAssets==0||!scope.row.netAssets?'--':scope.row.netAssets }}</template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -95,8 +99,8 @@ export default { ...@@ -95,8 +99,8 @@ export default {
let myChart = echarts.init(document.getElementById("echartsFinance")) let myChart = echarts.init(document.getElementById("echartsFinance"))
let barData = [],years = [],compareData = []; let barData = [],years = [],compareData = [];
this.viewData.map(item=>{ this.viewData.map(item=>{
barData.push(item[val+'Size'].toFixed(2)); barData.push(item[val+'Size']?item[val+'Size'].toFixed(2):'--');
compareData.push(item[val+'Compare']||''); compareData.push(item[val+'Compare']||'--');
years.push(item.year) years.push(item.year)
}) })
// let compareDataMax = Math.max(...compareData) // let compareDataMax = Math.max(...compareData)
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ 45996241
...@@ -11,8 +11,9 @@ ...@@ -11,8 +11,9 @@
<img :src="require('@/assets/images/detail/overview/logo@2x.png')" :alt="companyInfo.companyName" :title="companyInfo.companyName" v-else> <img :src="require('@/assets/images/detail/overview/logo@2x.png')" :alt="companyInfo.companyName" :title="companyInfo.companyName" v-else>
</div> </div>
<div class="company-title"> <div class="company-title">
<div class="company-name"> <div class="company-name flex-box" @mouseenter="ifShow=!ifShow" @mouseleave="ifShow=!ifShow">
{{companyInfo.companyName || '--'}} <div v-clipboard:copy="companyInfo.companyName" v-clipboard:success="clipboardSuccess">{{companyInfo.companyName || '--'}}</div>
<span v-clipboard:copy="companyInfo.companyName" v-clipboard:success="clipboardSuccess" v-if="companyInfo.companyName && ifShow">复制</span>
</div> </div>
<div class="company-tag"> <div class="company-tag">
<div style="float: left;margin-top: 8px;" class="company-history" v-if="companyInfo.historyNames && companyInfo.historyNames.length>0"> <div style="float: left;margin-top: 8px;" class="company-history" v-if="companyInfo.historyNames && companyInfo.historyNames.length>0">
...@@ -160,6 +161,7 @@ ...@@ -160,6 +161,7 @@
</template> </template>
<script> <script>
import ClipboardJS from 'clipboard'
import { changePath,encodeStr } from '@/assets/js/common' import { changePath,encodeStr } from '@/assets/js/common'
var Swiper = require('@/assets/lib/swiper/swiper-bundle.min.js') var Swiper = require('@/assets/lib/swiper/swiper-bundle.min.js')
import "@/assets/lib/swiper/swiper-bundle.css" import "@/assets/lib/swiper/swiper-bundle.css"
...@@ -171,6 +173,7 @@ export default { ...@@ -171,6 +173,7 @@ export default {
data() { data() {
return { return {
encodeStr, encodeStr,
ifShow:false,
newStatic: null, newStatic: null,
labelList: [], //企业标签 labelList: [], //企业标签
customerId:'', customerId:'',
...@@ -236,6 +239,10 @@ export default { ...@@ -236,6 +239,10 @@ export default {
} }
} }
}, },
/** 复制代码成功 */
clipboardSuccess() {
this.$modal.msgSuccess("复制成功");
},
//取消认领 //取消认领
cancelClaimClick(){ cancelClaimClick(){
this.dialogVisible1 = true; this.dialogVisible1 = true;
...@@ -522,6 +529,27 @@ export default { ...@@ -522,6 +529,27 @@ export default {
color: #000000; color: #000000;
font-weight: bold; font-weight: bold;
margin-right: 100px; margin-right: 100px;
cursor: pointer;
align-items: center;
span{
width: 44px;
height: 22px;
font-size: 12px;
line-height: 22px;
color: #666666;
text-align: center;
font-weight: 400;
display: inline-block;
border: 1px solid #EEEEEE;
border-radius: 2px;
cursor: pointer;
margin-left: 16px;
&:hover{
background: #E9F4FF;
color: #0081FF;
border: 1px solid #0081FF;
}
}
} }
.company-tag{ .company-tag{
overflow: hidden; overflow: hidden;
......
dsk-operate-ui/src/views/detail/party-a/overview/overseas.vue
View file @ 45996241
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
], ],
width: 130 width: 130
}, },
{ type: 3, fieldName: 'investName', value: '', placeholder: '输入企业名称查询'}, { type: 3, fieldName: 'keyword', value: '', placeholder: '输入企业名称查询'},
], ],
//列表 //列表
tableLoading:false, tableLoading:false,
......
dsk-operate-ui/src/views/radar/BidRecord/details.vue
View file @ 45996241
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
<el-table-column label="企业名称" > <el-table-column label="企业名称" >
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.companyId) " tag="a" class="list-titel-a blue" v-html="scope.row.companyName"></router-link> <router-link v-if="scope.row.uipId||scope.row.companyId" :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.companyId) " tag="a" class="list-titel-a blue" v-html="scope.row.companyName"></router-link>
<span v-else>{{ scope.row.companyName||'--' }}</span>
</template> </template>
</el-table-column> </el-table-column>
......
dsk-operate-ui/src/views/radar/Bidding/details.vue
View file @ 45996241
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<p class="list-content-text"> <p class="list-content-text">
<span>招采单位：</span> <span>招采单位：</span>
<span v-if="textList.tenderee"> <span v-if="textList.tenderee">
<router-link :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link> <router-link :to="'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
</span> </span>
<span v-else>--</span> <span v-else>--</span>
</p> </p>
......
dsk-system/src/main/java/com/dsk/system/domain/BusinessListDto.java
View file @ 45996241
...@@ -24,7 +24,7 @@ public class BusinessListDto { ...@@ -24,7 +24,7 @@ public class BusinessListDto {
/** /**
* 用户查看全部他人可见项目标示 * 用户查看全部他人可见项目标示
*/ */
private Integer others; private Long others;
/** /**
* 省id * 省id
......
dsk-system/src/main/java/com/dsk/system/mapper/BusinessRelateCompanyMapper.java
View file @ 45996241
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
/** /**
* 项目关联单位Mapper接口 * 项目关联单位Mapper接口
* *
* @author lxl * @author lxl
* @date 2023-05-17 * @date 2023-05-17
*/ */
...@@ -16,7 +16,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo ...@@ -16,7 +16,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo
{ {
/** /**
* 查询项目关联单位 * 查询项目关联单位
* *
* @param id 项目关联单位主键 * @param id 项目关联单位主键
* @return 项目关联单位 * @return 项目关联单位
*/ */
...@@ -24,7 +24,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo ...@@ -24,7 +24,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo
/** /**
* 查询项目关联单位列表 * 查询项目关联单位列表
* *
* @param businessRelateCompany 项目关联单位 * @param businessRelateCompany 项目关联单位
* @return 项目关联单位集合 * @return 项目关联单位集合
*/ */
...@@ -32,7 +32,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo ...@@ -32,7 +32,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo
/** /**
* 新增项目关联单位 * 新增项目关联单位
* *
* @param businessRelateCompany 项目关联单位 * @param businessRelateCompany 项目关联单位
* @return 结果 * @return 结果
*/ */
...@@ -40,7 +40,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo ...@@ -40,7 +40,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo
/** /**
* 修改项目关联单位 * 修改项目关联单位
* *
* @param businessRelateCompany 项目关联单位 * @param businessRelateCompany 项目关联单位
* @return 结果 * @return 结果
*/ */
...@@ -48,7 +48,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo ...@@ -48,7 +48,7 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo
/** /**
* 删除项目关联单位 * 删除项目关联单位
* *
* @param id 项目关联单位主键 * @param id 项目关联单位主键
* @return 结果 * @return 结果
*/ */
...@@ -56,9 +56,12 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo ...@@ -56,9 +56,12 @@ public interface BusinessRelateCompanyMapper extends BaseMapper<BusinessRelateCo
/** /**
* 批量删除项目关联单位 * 批量删除项目关联单位
* *
* @param ids 需要删除的数据主键集合 * @param ids 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteBusinessRelateCompanyByIds(Long[] ids); public int deleteBusinessRelateCompanyByIds(Long[] ids);
BusinessRelateCompany selectByProprietor(Integer id);
} }
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessBacklogServiceImpl.java
View file @ 45996241
...@@ -63,7 +63,9 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService { ...@@ -63,7 +63,9 @@ public class BusinessBacklogServiceImpl implements IBusinessBacklogService {
@Override @Override
@Transactional @Transactional
public int insertBusinessBacklog(BusinessBacklog businessBacklog) { public int insertBusinessBacklog(BusinessBacklog businessBacklog) {
if (businessBacklog.getDueTime().before(new Date())) throw new BaseException("到期时间必须大于当前时间"); if(ObjectUtil.isNotEmpty(businessBacklog.getDueTime())){
if (businessBacklog.getDueTime().before(new Date())) throw new BaseException("到期时间必须大于当前时间");
}
return businessBacklogMapper.insertBusinessBacklog(businessBacklog); return businessBacklogMapper.insertBusinessBacklog(businessBacklog);
} }
......
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java
View file @ 45996241
...@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; ...@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsk.acc.openapi.client.util.CommonUtils; import com.dsk.acc.openapi.client.util.CommonUtils;
import com.dsk.common.config.RuoYiConfig; import com.dsk.common.config.RuoYiConfig;
import com.dsk.common.constant.HttpStatus; import com.dsk.common.constant.HttpStatus;
...@@ -97,13 +98,10 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService { ...@@ -97,13 +98,10 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
*/ */
@Override @Override
public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) { public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
if (StringUtils.isEmpty(dto.getMinAmount())) dto.setMinAmount("0");
List<BusinessListVo> othersList = new ArrayList<>(); List<BusinessListVo> othersList = new ArrayList<>();
//userId不传值，就查询全部他人可见项目+自己的 //userId不传值，就查询全部他人可见项目+自己的
if (dto.getUserId() == null) { if (dto.getUserId() == null) {
Long userId = SecurityUtils.getLoginUser().getUserId(); dto.setOthers(SecurityUtils.getUserId());
if (userId == null) throw new BaseException("请登录");
dto.setOthers(userId.intValue());
//查询他人可见项目 //查询他人可见项目
othersList = businessInfoMapper.selectBusinessInfoList(dto); othersList = businessInfoMapper.selectBusinessInfoList(dto);
} }
...@@ -234,9 +232,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService { ...@@ -234,9 +232,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
} }
} }
BusinessRelateCompany relateCompany = dealwithCustomer(vo); int i = relateCompanyMapper.insertBusinessRelateCompany(dealwithCustomer(businessInfo));
relateCompany.setBusinessId(businessInfo.getId());
int i = relateCompanyMapper.insertBusinessRelateCompany(relateCompany);
if (i == 0) { if (i == 0) {
throw new ServiceException("业主单位信息添加失败！"); throw new ServiceException("业主单位信息添加失败！");
} }
...@@ -253,8 +249,11 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService { ...@@ -253,8 +249,11 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
@Override @Override
@Transactional @Transactional
public int updateBusinessInfo(BusinessInfo businessInfo) { public int updateBusinessInfo(BusinessInfo businessInfo) {
if (ObjectUtil.isEmpty(businessInfo.getId())) {
throw new BaseException("项目id不能为空！");
}
//判断资金Double类型的位数 //判断资金Double类型的位数
if (businessInfo.getInvestmentAmount() != null) { if (ObjectUtil.isNotEmpty(businessInfo.getInvestmentAmount())) {
int front = CheckUtils.checkIntegerPlaces(businessInfo.getInvestmentAmount()); int front = CheckUtils.checkIntegerPlaces(businessInfo.getInvestmentAmount());
int later = CheckUtils.checkDecimalPlaces(businessInfo.getInvestmentAmount()); int later = CheckUtils.checkDecimalPlaces(businessInfo.getInvestmentAmount());
if (front > 9) throw new BaseException("500", "小数点前最多支持9位"); if (front > 9) throw new BaseException("500", "小数点前最多支持9位");
...@@ -264,13 +263,45 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService { ...@@ -264,13 +263,45 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
if (!CheckUtils.isPhone(businessInfo.getConstructionPhone()) || !CheckUtils.isPhone(businessInfo.getSupervisorPhone())) if (!CheckUtils.isPhone(businessInfo.getConstructionPhone()) || !CheckUtils.isPhone(businessInfo.getSupervisorPhone()))
throw new BaseException("500", "请输入正确的电话号码"); throw new BaseException("500", "请输入正确的电话号码");
} }
BusinessInfo info = businessInfoMapper.selectBusinessInfoById(businessInfo.getId());
//查询企业的城投id和建设库id //查询企业的城投id和建设库id
Map map = queryUipIdOrCid(businessInfo.getConstructionUnit()); BusinessRelateCompany relateCompany = relateCompanyMapper.selectByProprietor(businessInfo.getId());
if (map.containsKey("jskEid")) { if (ObjectUtil.isNotEmpty(businessInfo.getConstructionUnit())) {
businessInfo.setConstructionUnitCid(MapUtils.getInteger(map, "jskEid", null)); Map map = queryUipIdOrCid(businessInfo.getConstructionUnit());
} else { if (map.containsKey("jskEid")) {
businessInfo.setConstructionUnitUipId(MapUtils.getString(map, "uipId", null)); businessInfo.setConstructionUnitCid(MapUtils.getInteger(map, "jskEid", null));
businessInfo.setConstructionUnitCid(MapUtils.getInteger(map, "companyId", null)); } else {
businessInfo.setConstructionUnitUipId(MapUtils.getString(map, "uipId", null));
businessInfo.setConstructionUnitCid(MapUtils.getInteger(map, "companyId", null));
}
//相关企业
if (ObjectUtil.isEmpty(relateCompany)) {
relateCompanyMapper.insertBusinessRelateCompany(dealwithCustomer(businessInfo));
}
if(ObjectUtil.isNotEmpty(relateCompany) && !businessInfo.getConstructionUnit().equals(relateCompany.getCompanyName())){
relateCompany.setCompanyId(businessInfo.getConstructionUnitCid());
relateCompany.setCompanyUipId(businessInfo.getConstructionUnitUipId());
relateCompany.setCompanyName(businessInfo.getConstructionUnit());
relateCompanyMapper.updateBusinessRelateCompany(relateCompany);
}
// //客户信息
// if(ObjectUtil.isNotEmpty(info.getCustomerId())){
// CustomerVo customerVo = customerService.info(info.getCustomerId());
// customerVo
// customerService.edit(customerVo);
// }else {
// Customer customer = new Customer();
// customer.setCompanyName()
// customerService.add()
// }
}
if (ObjectUtil.isNotEmpty(relateCompany)&&
(ObjectUtil.isNotEmpty(businessInfo.getConstructionPhone())
||ObjectUtil.isNotEmpty(businessInfo.getConstructionPrincipal()))) {
relateCompany.setPhone(businessInfo.getConstructionPhone());
relateCompany.setResponsiblePerson(businessInfo.getConstructionPrincipal());
relateCompanyMapper.updateBusinessRelateCompany(relateCompany);
} }
return businessInfoMapper.updateBusinessInfo(businessInfo); return businessInfoMapper.updateBusinessInfo(businessInfo);
} }
...@@ -364,14 +395,17 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService { ...@@ -364,14 +395,17 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
} }
private BusinessRelateCompany dealwithCustomer(Customer bean) { private BusinessRelateCompany dealwithCustomer(BusinessInfo bean) {
BusinessRelateCompany relateCompany = new BusinessRelateCompany(); BusinessRelateCompany relateCompany = new BusinessRelateCompany();
relateCompany.setCompanyId(bean.getCompanyId()); relateCompany.setBusinessId(bean.getId());
relateCompany.setCompanyUipId(bean.getUipId()); relateCompany.setCompanyId(bean.getConstructionUnitCid());
relateCompany.setCompanyName(bean.getCompanyName()); relateCompany.setCompanyUipId(bean.getConstructionUnitUipId());
relateCompany.setCompanyRole("业主"); relateCompany.setCompanyName(bean.getConstructionUnit());
relateCompany.setResponsiblePerson(bean.getLegalPerson()); relateCompany.setPhone(bean.getConstructionPhone());
relateCompany.setCompanyType("业主单位"); relateCompany.setCompanyRole("招采单位");
relateCompany.setResponsiblePerson(bean.getConstructionPrincipal());
relateCompany.setIsProprietor(1);
relateCompany.setRemark("业主单位");
return relateCompany; return relateCompany;
} }
} }
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessRelateCompanyServiceImpl.java
View file @ 45996241
package com.dsk.system.service.impl; package com.dsk.system.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsk.common.core.domain.entity.BusinessRelateCompany; import com.dsk.common.core.domain.entity.BusinessRelateCompany;
import com.dsk.common.exception.base.BaseException;
import com.dsk.common.utils.CheckUtils;
import com.dsk.common.utils.DateUtils; import com.dsk.common.utils.DateUtils;
import com.dsk.system.domain.BusinessIdDto; import com.dsk.system.domain.BusinessIdDto;
import com.dsk.system.mapper.BusinessRelateCompanyMapper; import com.dsk.system.mapper.BusinessRelateCompanyMapper;
...@@ -87,7 +90,9 @@ public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyS ...@@ -87,7 +90,9 @@ public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyS
@Transactional @Transactional
public int updateBusinessRelateCompany(BusinessRelateCompany businessRelateCompany) public int updateBusinessRelateCompany(BusinessRelateCompany businessRelateCompany)
{ {
// if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的电话号码"); if(ObjectUtil.isNotEmpty(businessRelateCompany.getPhone())){
if(!CheckUtils.isPhone(businessRelateCompany.getPhone())) throw new BaseException("500","请输入正确的电话号码");
}
businessRelateCompany.setUpdateTime(DateUtils.getNowDate()); businessRelateCompany.setUpdateTime(DateUtils.getNowDate());
//查询企业的城投id和建设库id //查询企业的城投id和建设库id
Map map = businessInfoService.queryUipIdOrCid(businessRelateCompany.getCompanyName()); Map map = businessInfoService.queryUipIdOrCid(businessRelateCompany.getCompanyName());
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ 45996241
...@@ -100,10 +100,10 @@ ...@@ -100,10 +100,10 @@
u.nick_name nickName, u.nick_name nickName,
GROUP_CONCAT(DISTINCT l.label) label GROUP_CONCAT(DISTINCT l.label) label
FROM business_info i FROM business_info i
LEFT JOIN business_user bu on bu.business_id = i.id
LEFT JOIN business_follow_record f on f.business_id = i.id LEFT JOIN business_follow_record f on f.business_id = i.id
LEFT JOIN business_label l on l.business_id = i.id LEFT JOIN business_label l on l.business_id = i.id
LEFT JOIN business_user bu on bu.business_id = i.id LEFT JOIN sys_user u on u.user_id = bu.user_id
LEFT JOIN sys_user u on u.user_id = f.user_id
<where> <where>
<if test="userId != null"> <if test="userId != null">
and bu.user_id = #{userId} and bu.user_id = #{userId}
...@@ -114,20 +114,8 @@ ...@@ -114,20 +114,8 @@
#{projectType} #{projectType}
</foreach> </foreach>
</if> </if>
<if test="minAmount != null and minAmount != '' and minAmount != '0' and maxAmount != minAmount"> <if test="minAmount != null and minAmount != ''"> and i.investment_amount &gt;= #{minAmount} </if>
and i.investment_amount &gt; #{minAmount} <if test="maxAmount != null and maxAmount != ''"> and i.investment_amount &lt;= #{maxAmount}</if>
</if>
<if test="minAmount == '0' and maxAmount != minAmount">
and ((i.investment_amount &gt; #{minAmount}
and i.investment_amount &lt;= #{maxAmount})
or i.investment_amount is null)
</if>
<if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount and minAmount != '0'">
and i.investment_amount &lt;= #{maxAmount}
</if>
<if test="minAmount != null and minAmount != '' and maxAmount != null and maxAmount != '' and maxAmount == minAmount">
and i.investment_amount = #{minAmount}
</if>
<if test="projectStage != null and projectStage != ''"> <if test="projectStage != null and projectStage != ''">
and i.project_stage in and i.project_stage in
<foreach collection="projectStage" item="projectStage" open="(" separator="," close=")"> <foreach collection="projectStage" item="projectStage" open="(" separator="," close=")">
......
dsk-system/src/main/resources/mapper/business/BusinessRelateCompanyMapper.xml
View file @ 45996241
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
<result property="companyRole" column="company_role"/> <result property="companyRole" column="company_role"/>
<result property="responsiblePerson" column="responsible_person"/> <result property="responsiblePerson" column="responsible_person"/>
<result property="phone" column="phone"/> <result property="phone" column="phone"/>
<result property="isProprietor" column="is_proprietor"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="depth" column="depth"/> <result property="depth" column="depth"/>
<result property="companyType" column="company_type"/>
<result property="companyUipId" column="company_uip_id"/> <result property="companyUipId" column="company_uip_id"/>
</resultMap> </resultMap>
...@@ -28,9 +29,10 @@ ...@@ -28,9 +29,10 @@
responsible_person, responsible_person,
phone, phone,
depth, depth,
is_proprietor,
remark,
create_time, create_time,
update_time, update_time,
company_type,
company_uip_id company_uip_id
from business_relate_company from business_relate_company
</sql> </sql>
...@@ -50,7 +52,6 @@ ...@@ -50,7 +52,6 @@
#{responsiblePerson} #{responsiblePerson}
</if> </if>
<if test="phone != null and phone != ''">and phone = #{phone}</if> <if test="phone != null and phone != ''">and phone = #{phone}</if>
<if test="companyType != null and companyType != ''">and company_type = #{companyType}</if>
</where> </where>
</select> </select>
...@@ -70,7 +71,8 @@ ...@@ -70,7 +71,8 @@
<if test="companyRole != null">company_role,</if> <if test="companyRole != null">company_role,</if>
<if test="responsiblePerson != null">responsible_person,</if> <if test="responsiblePerson != null">responsible_person,</if>
<if test="phone != null">phone,</if> <if test="phone != null">phone,</if>
<if test="companyType != null">company_type,</if> <if test="isProprietor != null">is_proprietor,</if>
<if test="remark != null and remark != '' ">remark,</if>
<if test="companyUipId != null">company_uip_id,</if> <if test="companyUipId != null">company_uip_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
...@@ -81,26 +83,24 @@ ...@@ -81,26 +83,24 @@
<if test="companyRole != null">#{companyRole},</if> <if test="companyRole != null">#{companyRole},</if>
<if test="responsiblePerson != null">#{responsiblePerson},</if> <if test="responsiblePerson != null">#{responsiblePerson},</if>
<if test="phone != null">#{phone},</if> <if test="phone != null">#{phone},</if>
<if test="companyType != null">#{companyType},</if> <if test="isProprietor != null">#{isProprietor},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="companyUipId != null">#{companyUipId},</if> <if test="companyUipId != null">#{companyUipId},</if>
</trim> </trim>
</insert> </insert>
<update id="updateBusinessRelateCompany" parameterType="com.dsk.common.core.domain.entity.BusinessRelateCompany"> <update id="updateBusinessRelateCompany" parameterType="com.dsk.common.core.domain.entity.BusinessRelateCompany">
update business_relate_company update business_relate_company
<trim prefix="SET" suffixOverrides=","> <set>
<if test="businessId != null">business_id = #{businessId},</if> <if test="companyId != null">company_id = #{companyId},</if>
company_id = #{companyId}, <if test="companyUipId != null">company_uip_id = #{companyUipId},</if>
company_uip_id = #{companyUipId},
<if test="companyName != null">company_name = #{companyName},</if> <if test="companyName != null">company_name = #{companyName},</if>
<if test="depth != null">depth = #{depth},</if> <if test="depth != null">depth = #{depth},</if>
<if test="companyRole != null">company_role = #{companyRole},</if> <if test="companyRole != null">company_role = #{companyRole},</if>
<if test="responsiblePerson != null">responsible_person = #{responsiblePerson},</if> <if test="responsiblePerson != null">responsible_person = #{responsiblePerson},</if>
<if test="phone != null">phone = #{phone},</if> <if test="phone != null">phone = #{phone},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="remark != null">remark = #{remark},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> </set>
<if test="companyType != null">company_type = #{companyType},</if>
</trim>
where id = #{id} where id = #{id}
</update> </update>
...@@ -116,4 +116,9 @@ ...@@ -116,4 +116,9 @@
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
<select id="selectByProprietor" resultType="com.dsk.common.core.domain.entity.BusinessRelateCompany">
<include refid="selectBusinessRelateCompanyVo"/>
where business_id = #{businessId} and is_proprietor = 1
</select>
</mapper> </mapper>
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