Skip to content

D
dsk-cr20g
Commit 50cfdfac authored by huangjie's avatar huangjie
Browse files
Options

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

parents fcea0dd2 96cce16c
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 38 deletions
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectLandDetailBody.java
View file @ 50cfdfac
......@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
@EqualsAndHashCode(callSuper = false)
public class EnterpriseProjectLandDetailBody {
/**
* 企业id
* id
*/
@NotNull(message = "id不能为空")
private Integer id;
......
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseUipSearchBody.java
View file @ 50cfdfac
......@@ -17,7 +17,7 @@ public class EnterpriseUipSearchBody extends BasePage {
/**
* 查询关键字
*/
private String keys;
private List<String> keys;
/*
......
dsk-operate-ui/src/router/index.js
View file @ 50cfdfac
......@@ -107,17 +107,30 @@ export const constantRoutes = [
path: '/company',
component: Layout,
hidden: true,
name: 'Company',
redirect: 'noredirect',
children: [
{
path: '/company/:id',
component: () => import('@/views/detail/party-b/index'),
name: 'PartyB',
name: 'Company',
meta: { title: '已方详情' }
}
]
},
{
path: '/personnel',
component: Layout,
hidden: true,
redirect: 'noredirect',
children: [
{
path: '/personnel/:id',
component: () => import('@/views/detail/party-b/index'),
name: 'Personnel',
meta: { title: '已方人员详情' }
}
]
},
{
path: '/structure',
component: Layout,
......
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ 50cfdfac
......@@ -9,6 +9,7 @@
</el-input>
<el-menu
ref="sideMenu"
:unique-opened="true"
:default-active="routeIndex"
class="detail-menu"
@open="handleOpen">
......
dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue
View file @ 50cfdfac
......@@ -86,17 +86,17 @@
</div>
</el-form-item>
<el-form-item label="项目阶段：" prop="projectStage">
<el-select v-model="addParam.projectStage" style="width: 100%" class="form-content-width" placeholder="请选择项目状态">
<el-select v-model="addParam.projectStage" style="width: 100%" class="form-content-width" placeholder="请选择项目阶段">
<el-option v-for="(item, index) in projectStage" :key="index" :label="item.dictLabel" :value="item.dictValue" />
</el-select>
</el-form-item>
<el-form-item label="项目类型：" prop="projectType">
<el-select v-model="addParam.projectType" style="width: 100%" class="form-content-width" placeholder="请选择项目阶段">
<el-select v-model="addParam.projectType" style="width: 100%" class="form-content-width" placeholder="请选择项目类型">
<el-option v-for="(item, index) in projectType" :key="index" :label="item.dictLabel" :value="item.dictValue" />
</el-select>
</el-form-item>
<el-form-item label="项目类别：" prop="projectCategory">
<el-select v-model="addParam.projectCategory" style="width: 100%" class="form-content-width" placeholder="请选择项目阶段">
<el-select v-model="addParam.projectCategory" style="width: 100%" class="form-content-width" placeholder="请选择项目类别">
<el-option v-for="(item, index) in projectCategory" :key="index" :label="item.dictLabel" :value="item.dictValue" />
</el-select>
</el-form-item>
......
dsk-operate-ui/src/views/detail/party-a/overview/branch.vue
View file @ 50cfdfac
......@@ -23,7 +23,7 @@
<div v-else v-html="scope.row.name || '--'"></div>
<div class="tags" v-if="scope.row.status || scope.row.biddingAnnouncement">
<span class="tag style1" v-if="scope.row.status">{{scope.row.status}}</span>
<span class="tag style1" v-if="scope.row.biddingAnnouncement">招标数{{scope.row.biddingAnnouncement}}</span>
<span class="tag style1" v-if="scope.row.biddingCount">招标数{{scope.row.biddingCount}}</span>
</div>
</template>
</tables>
......
dsk-operate-ui/src/views/detail/party-a/overview/component/relationship.vue
View file @ 50cfdfac
......@@ -40,7 +40,7 @@
<div v-else v-html="scope.row.investName || '--'"></div>
<div class="tags" v-if="scope.row.businessStatus || scope.row.biddingAnnouncement">
<span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag style1" v-if="scope.row.biddingAnnouncement">招标数{{scope.row.biddingAnnouncement}}</span>
<span class="tag style1" v-if="scope.row.biddingCount">招标数{{scope.row.biddingCount}}</span>
</div>
</template>
</el-table-column>
......
dsk-operate-ui/src/views/detail/party-a/overview/holderinfo.vue
View file @ 50cfdfac
......@@ -24,7 +24,9 @@
<div v-else v-html="scope.row.stockName || '--'"></div>
<div class="tags" v-if="scope.row.businessStatus">
<span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag style1" v-if="scope.row.biddingAnnouncement">招标{{scope.row.biddingAnnouncement}}</span>
<span class="tag style1" v-if="scope.row.biddingCount">招标{{scope.row.biddingCount}}</span>
<span class="tag style1" v-if="scope.row.landInfoCount">土地{{scope.row.landInfoCount}}</span>
<span class="tag style1" v-if="scope.row.proposedProjectCount">拟建{{scope.row.proposedProjectCount}}</span>
</div>
</template>
<template slot="stockPercent" slot-scope="scope">
......
dsk-operate-ui/src/views/detail/party-a/overview/overseas.vue
View file @ 50cfdfac
......@@ -23,7 +23,7 @@
<div v-else v-html="scope.row.investName || '--'"></div>
<div class="tags" v-if="scope.row.businessStatus || scope.row.biddingAnnouncement">
<span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag style1" v-if="scope.row.biddingAnnouncement">招标数{{scope.row.biddingAnnouncement}}</span>
<span class="tag style1" v-if="scope.row.biddingCount">招标数{{scope.row.biddingCount}}</span>
</div>
</template>
<template slot="proportion">
......@@ -75,9 +75,9 @@ export default {
{name:'不限',value:'noLimit'},
{name:'100%',value:'1~1'},
{name:'66.66%以上',value:'0.6666~1'},
{name:'50%以上',value:'0.4~1'},
{name:'50%以上',value:'0.5~1'},
{name:'33.33%以上',value:'0.3333~1'},
{name:'25%以上',value:'0.05~0.25'},
{name:'25%以上',value:'0.25~1'},
{name:'不到5%',value:'0~0.05'}
]
}
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue
View file @ 50cfdfac
......@@ -94,6 +94,10 @@ export default {
prop: 'industryTotalValue',
label: '工业总产值（亿元）',
},
{
prop: 'fixedInvestment',
label: '固定资产投资（亿元）',
},
{
prop: 'realEstateInvestment',
label: '房地产开发投资（亿元）',
......@@ -291,9 +295,9 @@ export default {
}
}
::v-deep .el-table__body-wrapper tr:nth-child(2) td:first-child,
::v-deep .el-table__body-wrapper tr:nth-child(16) td:first-child,
::v-deep .el-table__body-wrapper tr:nth-child(28) td:first-child{
::v-deep .el-table__body-wrapper tr:nth-child(2) td,
::v-deep .el-table__body-wrapper tr:nth-child(17) td,
::v-deep .el-table__body-wrapper tr:nth-child(29) td{
font-weight: bold;
color: #232323;
}
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue
View file @ 50cfdfac
......@@ -24,7 +24,7 @@
<span class="wrap_label">行政等级</span>
<div class="item_ckquery">
<span :class="{color_text:queryParams.uipExecutiveLevel == ''}" @click="changeXZDJ('')">全部</span>
<template v-for="(item,index) in xzdj">
<template v-for="(item,index) in uipGroupDatalist.uipExecutiveLevel">
<span :class="{color_text:item == queryParams.uipExecutiveLevel}" @click="changeXZDJ(item)">{{item}}</span>
</template>
</div>
......@@ -101,6 +101,16 @@
<router-link :to="`/enterprise/${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>
</template>
<template slot="area" slot-scope="scope">
<template v-if="scope.row.province || scope.row.city || scope.row.area">
<span v-if="scope.row.province"> {{ scope.row.province }}</span>
<span v-if="scope.row.city"> <span v-if="scope.row.province">-</span>{{ scope.row.city }}</span>
<span v-if="scope.row.area"> <span v-if="scope.row.city">-</span>{{ scope.row.area }}</span>
</template>
<template v-else>
--
</template>
</template>
</tables>
</div>
......@@ -137,7 +147,7 @@ export default {
},
forData: [
{label: '企业名称', prop: 'companyName', width: '369', slot: true},
{label: '区域', prop: 'area', width: '100'},
{label: '区域', prop: 'area', width: '120', slot: true},
{label: '招标数量', prop: 'biddingCount', width: '100', sortable: true},
{label: '城投拿地', prop: 'landInfoCount', width: '100', sortable: true},
{label: '供应商', prop: 'supplierCount', width: '100', sortable: true},
......
dsk-operate-ui/src/views/detail/party-b/index.vue
View file @ 50cfdfac
......@@ -15,6 +15,8 @@ export default {
loading: false, // 是否加载中
iframeHight: window.innerHeight, // iframe高度
scrollTop: 0, // 滚动条距离内部页面顶部距离
// domain: 'https://pre-plug.jiansheku.com',
domain: 'http://192.168.60.30:3300',
ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912' // 需要携带的sdkId
}
},
......@@ -22,7 +24,12 @@ export default {
if (this.$route.params.id) { // 获取companyId
this.loading = true
// this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?ak=${this.ak}`
this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}?ak=${this.ak}`
if(this.$route.name=='Company'){ //企业详情
this.src = `${this.domain}/enterprise/${this.$route.params.id}?ak=${this.ak}`
}
if(this.$route.name=='Personnel'){ //人员详情
this.src = `${this.domain}/personnel/${this.$route.params.id}.html?ak=${this.ak}&referrer=true`
}
}
},
mounted() {
......
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessFollowRecordServiceImpl.java
View file @ 50cfdfac
package com.dsk.system.service.impl;
import com.dsk.common.core.domain.entity.BusinessFollowRecord;
import com.dsk.common.exception.base.BaseException;
import com.dsk.common.utils.DateUtils;
import com.dsk.common.utils.SecurityUtils;
import com.dsk.system.domain.BusinessIdDto;
import com.dsk.system.domain.BusinessListDto;
import com.dsk.system.domain.vo.BusinessListVo;
......@@ -47,12 +45,12 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer
@Override
public List<BusinessFollowRecord> allFollow(BusinessListDto dto) {
//userId不传值，就查询全部门项目
if (dto.getUserId() == null) {
Long deptId = SecurityUtils.getLoginUser().getDeptId();
if (deptId == null) throw new BaseException("请登录");
dto.setDeptId(deptId.intValue());
}
//userId不传值，就查询全部
// if (dto.getUserId() == null) {
// Long deptId = SecurityUtils.getLoginUser().getDeptId();
// if (deptId == null) throw new BaseException("请登录");
// dto.setDeptId(deptId.intValue());
// }
return businessFollowRecordMapper.allFollow(dto);
}
......
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java
View file @ 50cfdfac
......@@ -81,11 +81,11 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
@Override
public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
//userId不传值，就查询全部门项目
if (dto.getUserId() == null) {
Long deptId = SecurityUtils.getLoginUser().getDeptId();
if (deptId == null) throw new BaseException("请登录");
dto.setDeptId(deptId.intValue());
}
// if (dto.getUserId() == null) {
// Long deptId = SecurityUtils.getLoginUser().getDeptId();
// if (deptId == null) throw new BaseException("请登录");
// dto.setDeptId(deptId.intValue());
// }
return businessInfoMapper.selectBusinessInfoList(dto);
}
......@@ -146,7 +146,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
}
}
result.add("导入项目成功条数" + rowSuccess);
result.add("导入项目失败条数" + errorCount);
result.add("导入项目去重条数" + errorCount);
AjaxResult success = AjaxResult.success(String.join(",", result));
success.put("successCount",rowSuccess);
return success;
......
dsk-system/src/main/resources/mapper/business/BusinessFollowRecordMapper.xml
View file @ 50cfdfac
......@@ -72,9 +72,6 @@
<if test="userId != null">
and f.user_id = #{userId}
</if>
<if test="deptId != null">
and u.dept_id = #{deptId}
</if>
</where>
ORDER BY f.creat_time DESC
</select>
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ 50cfdfac
......@@ -131,8 +131,8 @@
<if test="userId != null">
and bu.user_id = #{userId}
</if>
<if test="deptId != null">
and bu.dept_id = #{deptId} and i.is_private = 1
<if test="userId == null">
and i.is_private = 1
</if>
<if test="provinceId != null and provinceId.size > 0 and cityId == null and districtId == null">
......
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