Skip to content

D
dsk-cr20g
Commit de62c298 authored by MyName's avatar MyName
Browse files
Options

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

parents 32d15d06 24888aae
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1635 additions and 121 deletions
dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java
View file @ de62c298
......@@ -45,12 +45,6 @@ public class EnterpriseController {
return enterpriseService.bidDataGroup(vo);
}
@ApiOperation(value = "供应商列表（建设库）")
@PostMapping(value = "supplierPage")
public R supplierPage(@RequestBody @Valid EnterpriseSupplierPageBody vo) throws Exception {
return enterpriseService.supplierPage(vo);
}
@ApiOperation(value = "甲方业绩数据（openApi）")
@PostMapping(value = "projectTenderDataGroup")
public R projectTenderDataGroup(@RequestBody @Valid EnterpriseProjectTenderDataGroupBody vo) throws Exception {
......@@ -75,30 +69,6 @@ public class EnterpriseController {
return enterpriseService.affiliates(vo);
}
@ApiOperation(value = "招标公告列表（建设库）")
@PostMapping(value = "bidNoticePage")
public R bidNoticePage(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
return enterpriseService.bidNoticePage(vo);
}
@ApiOperation(value = "招标公告省份（建设库）")
@PostMapping(value = "bidNoticeProvince")
public R bidNoticeProvince(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
return enterpriseService.bidNoticeProvince(vo);
}
@ApiOperation(value = "招标公告信息类型（建设库）")
@PostMapping(value = "bidNoticeTenderStage")
public R bidNoticeTenderStage(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
return enterpriseService.bidNoticeTenderStage(vo);
}
@ApiOperation(value = "招标公告详情（建设库）")
@PostMapping(value = "bidNoticeDeatil")
public R bidNoticeDeatil(@RequestBody @Valid EnterpriseBidNoticeDetailBody vo) throws Exception {
return enterpriseService.bidNoticeDeatil(vo);
}
@ApiOperation(value = "企业动态列表（建设库）")
@PostMapping(value = "dynamicPage")
public TableDataInfo dynamicPage(@RequestBody @Valid EnterpriseDynamicPageBody vo) throws Exception {
......@@ -129,4 +99,10 @@ public class EnterpriseController {
return enterpriseService.bestStockPage(vo);
}
@ApiOperation(value = "财务简析（openApi）")
@PostMapping(value = "financial")
public R financial(@RequestBody @Valid EnterpriseFinancialBody vo) throws Exception {
return enterpriseService.financial(vo);
}
}
dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java
View file @ de62c298
......@@ -26,7 +26,7 @@ public class CompanySearchController {
*/
@RequestMapping("/index")
public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
return opportunityRadarService.enterprisePage(compose);
return opportunityRadarService.enterpriseIndex(compose);
}
/*
......@@ -36,4 +36,12 @@ public class CompanySearchController {
public AjaxResult findByName(@PathVariable String keyword) {
return opportunityRadarService.enterpriseByName(keyword);
}
/*
* 完全匹配企业名称
*/
@GetMapping("/page")
public AjaxResult page(@RequestBody ComposeQueryDto compose) {
return opportunityRadarService.enterprisePage(compose);
}
}
dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java
View file @ de62c298
......@@ -18,10 +18,12 @@ public interface BusinessOpportunityRadarService {
AjaxResult landMarketPage(ComposeQueryDto compose);
AjaxResult establishmentPage(ComposeQueryDto compose);
AjaxResult enterprisePage(ComposeQueryDto compose);
AjaxResult enterpriseIndex(ComposeQueryDto compose);
AjaxResult enterpriseByName(String keyword);
AjaxResult enterprisePage(ComposeQueryDto compose);
AjaxResult bondProjectPage(ComposeQueryDto compose);
AjaxResult jskBidPlanPage(ComposeQueryDto compose);
......
dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java
View file @ de62c298
......@@ -51,11 +51,18 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
}
@Override
public AjaxResult enterprisePage(ComposeQueryDto compose) {
public AjaxResult enterpriseIndex(ComposeQueryDto compose) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
return BeanUtil.toBean(map, AjaxResult.class);
}
@Override
public AjaxResult enterprisePage(ComposeQueryDto compose) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page", BeanUtil.beanToMap(compose, false, false));
return BeanUtil.toBean(map, AjaxResult.class);
}
@Override
public AjaxResult enterpriseByName(String keyword){
Map<String,Object> params = new HashMap<>();
......
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseFinancialBody.java 0 → 100644
View file @ de62c298
package com.dsk.common.core.domain.model;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.NotNull;
@Data
@ToString
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class EnterpriseFinancialBody
{
/**
* 企业id
*/
@NotNull(message = "企业id不能为空")
private Integer cid;
}
dsk-common/src/main/java/com/dsk/common/dtos/SpecialBondInformationPageDto.java
View file @ de62c298
......@@ -12,4 +12,9 @@ import lombok.Data;
*/
@Data
public class SpecialBondInformationPageDto extends BasePage {
/**
* 专项债券唯一标识
*/
private String specialBondUuid;
}
dsk-common/src/main/java/com/dsk/common/dtos/UrbanInvestmentPlatformDto.java
View file @ de62c298
......@@ -56,4 +56,18 @@ public class UrbanInvestmentPlatformDto extends BasePage {
* 区
*/
private Integer areaId;
/**
* 关键词
*/
private String keyword;
/**
* 排序字段
*/
private String field;
/**
* 字段 desc asc
*/
private String order;
}
dsk-common/src/main/java/com/dsk/common/utils/DskOpenApiUtil.java
View file @ de62c298
......@@ -32,7 +32,8 @@ public class DskOpenApiUtil {
}
public Map<String,Object> requestBodyLocal(String path, Map<String, Object> bodyMap){
return JSONUtil.toBean(HttpUtil.post("http://127.0.0.1:8766"+path, JSONUtil.toJsonStr(bodyMap)), JSONConfig.create().setIgnoreNullValue(true), Map.class);
String post = HttpUtil.post("http://127.0.0.1:8766" + path, JSONUtil.toJsonStr(bodyMap));
return CommonUtils.assertAsMap(CommonUtils.parseJSON(post));
}
public Map<String,Object> requestBodyWithHeader(String path, Map<String, Object> bodyMap, Map<String, String> headerMap){
......
dsk-operate-ui/src/api/detail/party-a/cooperate.js 0 → 100644
View file @ de62c298
import request from '@/utils/request'
// 合作情况列表
export function getList(data) {
return request({
url: '/customer/business/list',
method: 'get',
params:data
})
}
dsk-operate-ui/src/assets/styles/public.css
View file @ de62c298
......@@ -306,7 +306,7 @@ select {
.el-dropdown-land .el-icon-caret-bottom {
color: #333333;
margin-left: 4px;
margin-left: 2px;
}
.land_date_picker {
......
dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue
View file @ de62c298
......@@ -2,7 +2,6 @@
<div class="cooperate">
<template v-if="ifEmpty">
<head-form
:form-data="formData"
:query-params="queryParams"
......@@ -136,6 +135,10 @@
<script>
import mixin from '../mixins/mixin'
import {getDictType,} from '@/api/main'
import {
getList
} from '@/api/detail/party-a/cooperate'
export default {
name: 'Cooperate',
mixins: [mixin],
......@@ -146,7 +149,7 @@ export default {
return {
ifEmpty:true,
queryParams: {
cid: 6034,
customerId: 6034,
pageNum: 1,
pageSize: 10
},
......@@ -157,23 +160,9 @@ export default {
{label: '项目状态', prop: 'fileNum', width: '90'}
],
formData: [
{ type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '项目阶段',
options: [
{ name: '项目阶段', value: '1' },
{ name: '项目阶段', value: '2' },
{ name: '项目阶段', value: '3' },
{ name: '项目阶段', value: '4' }
]
},
{ type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '项目状态',
options: [
{ name: '项目状态', value: '1' },
{ name: '项目状态', value: '2' },
{ name: '项目状态', value: '3' },
{ name: '项目状态', value: '4' }
]
},
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入企业名称查询', options: []},
{ type: 1, fieldName: 'projectStage', value: '', placeholder: '项目阶段', options: []},
{ type: 1, fieldName: 'status', value: '', placeholder: '项目状态', options: []},
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入企业名称查询'},
],
stageOptions:[],
statusOptions:[],
......@@ -189,25 +178,40 @@ export default {
}
},
created() {
this.list()
//项目阶段
this.handleOptions('project_stage_type',0)
//项目状态
this.handleOptions('project_status_type',1)
},
computed: {
},
methods: {
resetQuery() {
handleQuery(params) {
this.list(params)
},
//分页
handleCurrentChange(e){
},
handleSizeChange(e){
list(params){
let data = params ? params : this.queryParams
getList(data).then(res=>{
console.log(res)
})
},
//弹窗
handleClose(done) {
this.drawer = false
},
handleOptions(name,index){
getDictType(name).then(res=>{
if(res.code == 200 && res.data){
for(var i=0;i<res.data.length;i++){
this.formData[index].options.push({
name:res.data[i].dictLabel,
value:res.data[i].dictValue
})
}
}
})
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/decisionMaking/index.vue
View file @ de62c298
......@@ -33,44 +33,35 @@
<!-- 弹窗添加联系人 -->
<el-dialog
class="popups"
class="popups1"
:visible.sync="dialogVisible"
width="464px">
<div class="poptitle">
<img src="@/assets/images/economies/icon.png">
<span>重庆市轨道交通3号线二期工程4标段施工总承包</span>
</div>
<el-form class="popform" label-width="137px">
<div class="row">
<span class="left">联系人姓名：</span>
<el-input type="text" placeholder="请输入"></el-input>
</div>
<div class="row">
<span class="left">联系人角色：</span>
<el-select placeholder="请选择">
<el-option label="cccc" value="11"></el-option>
<el-option label="cccc" value="121"></el-option>
</el-select>
</div>
<div class="row">
<span class="left">联系人职位：</span>
<el-input type="text" placeholder="请输入"></el-input>
</div>
<div class="row">
<span class="left">联系人公司/机关：</span>
<el-input type="text" placeholder="请输入"></el-input>
</div>
<div class="row">
<span class="left">内部维护人：</span>
<el-input type="text" placeholder="请输入"></el-input>
</div>
<div class="row">
<span class="left">联系方式：</span>
<el-input type="text" placeholder="请输入"></el-input>
</div>
<el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="75px">
<el-form-item label="姓名：" prop="name">
<el-input v-model="addRorm.name" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="角色：" prop="role">
<el-input v-model="addRorm.role" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="职位：" prop="workUnit">
<el-input v-model="addRorm.workUnit" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="公司/机关：" prop="position">
<el-input v-model="addRorm.position" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="联系方式：" prop="contactInformation">
<el-input v-model="addRorm.contactInformation" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="备注：" prop="remark">
<el-input v-model="addRorm.remark" placeholder="请输入"></el-input>
</el-form-item>
<div class="popbot">
<div class="btn btn_cancel h32" @click="cancel">返回</div>
<div class="btn btn_primary h32">保存</div>
<div class="btn btn_cancel h32" @click="cancel('addRorm')">返回</div>
<div class="btn btn_primary h32" @click="add('addRorm')">保存</div>
</div>
</el-form>
</el-dialog>
......@@ -79,11 +70,11 @@
</template>
<script>
import Tables from "../component/Tables"
import {
getList,
addChain
} from '@/api/decisionMaking/decisionMaking'
import Tables from "../component/Tables"
} from '@/api/detail/party-a/decisionMaking'
export default {
name: 'DecisionMaking',
components: {
......@@ -93,7 +84,7 @@ export default {
return {
ifEmpty:true,
queryParams:{
customerId:null,
customerId:6034,
pageNum:1,
pageSize:10,
},
......@@ -106,6 +97,20 @@ export default {
{label: '内部维护人', prop: 'office', width: '88'},
{label: '备注', prop: 'dataId'},
],
addRorm: {
customerId:'',
name:'',
role:'',
workUnit:'',
position:'',
contactInformation:'',
remark:'',
},
addRules:{
name: [
{ required: true, message: '请输入姓名', trigger: 'blur' },
],
},
stageOptions:[],
statusOptions:[],
//列表
......@@ -129,18 +134,23 @@ export default {
getList(this.queryParams).then((res) => {
console.log(res)
})
},
resetQuery() {
},
//分页
handleCurrentChange(e){
console.log(e)
},
handleSizeChange(e){
add(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
this.addRorm.customerId = 11
addChain(this.addRorm).then((res) => {
console.log(res)
})
}
});
},
cancel(){
cancel(formName){
this.$refs[formName].resetFields();
this.dialogVisible = false
},
//打开新建窗口
......@@ -159,7 +169,12 @@ export default {
border: 1px solid #EFEFEF;
}
::v-deep .el-form-item{
margin-right: 8px !important;
margin-bottom: 16px;
}
::v-deep .el-input__inner{
border-radius: 2px 0 2px 0;
height: 32px;
line-height: 32px;
}
.cooperate-name{
::v-deep .el-form-item__content{
......@@ -175,10 +190,7 @@ export default {
cursor: pointer;
}
}
::v-deep .el-input__inner{
border-right: 0;
border-radius: 2px 0 2px 0;
}
}
.query-add{
button{
......@@ -231,7 +243,7 @@ export default {
margin-top: 10px;
}
// 弹窗
.popups{
.popups1{
.poptitle {
line-height: 48px;
border-bottom: 1px solid #E1E1E1;
......@@ -257,8 +269,14 @@ export default {
text-overflow: ellipsis;
}
}
::v-deep .el-dialog__body{
padding: 24px 24px 18px;
}
.popform {
padding-top: 24px;
padding-top: 14px;
::v-deep .el-form-item__label{
padding:0;
}
.row {
padding-bottom: 16px;
.left {
......
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @ de62c298
......@@ -34,7 +34,7 @@
<!-- 决策链条 -->
<DecisionMaking v-if="currentPath.pathName=='decisionMaking'" />
<!-- 跟进记录 -->
<Gjjl v-if="currentPath.pathName=='gjjl'" />
<Gjjl v-if="currentPath.pathName=='gjjl'" types="gjdt" />
</div>
</div>
</div>
......
dsk-operate-ui/src/views/radar/Land/details.vue
View file @ de62c298
......@@ -519,7 +519,8 @@
padding-left: 12px;
font-size: 12px;
}
.span-one{
.span-one {
width: 90%;
}
......
dsk-operate-ui/src/views/radar/index.vue
View file @ de62c298
......@@ -13,8 +13,12 @@
</div>
</div>
</div>
<!-- 企业专项债 -->
<debtProject v-if="personnelHerf=='debtProject'" />
<!-- 土地交易 -->
<Land v-if="personnelHerf=='Land'" />
<!-- 拟建项目 -->
<Establishment v-if="personnelHerf=='Establishment'" />
</div>
......@@ -22,10 +26,11 @@
<script>
import debtProject from "./components/debtProject/index.vue";
import Land from "./components/Land/index.vue";
import Establishment from "./components/Establishment/index.vue";
import "@/assets/styles/public.css";
export default {
name: 'radar',
components: { debtProject,Land },
components: { debtProject,Land,Establishment },
data() {
return {
// tablist
......@@ -42,7 +47,7 @@
},
{
key: 'KeyPersonnel',
key: 'Establishment',
status: false,
value: '拟建项目',
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @ de62c298
......@@ -123,4 +123,9 @@ public class EnterpriseService {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bestStockPage", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map);
}
public R financial(EnterpriseFinancialBody body) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/financial", BeanUtil.beanToMap(body, false, false));
return BeanUtil.toBean(map, R.class);
}
}
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java
View file @ de62c298
......@@ -112,8 +112,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
int addBusiness = businessInfoMapper.insertBusinessInfo(businessInfo);
if (addBusiness > 0) {
//获取登陆用户的部门id
// Long deptId = SecurityUtils.getLoginUser().getDeptId();
Long deptId = 100l;
Long deptId = SecurityUtils.getLoginUser().getDeptId();
// Long deptId = 100l;
//新增用户-项目关系信息
int addbusinessUser = businessUserMapper.insertBusinessUser(new BusinessUser(businessInfo.getId(), deptId.intValue(), dto.getUserId(), 1));
//新增项目-关联企业信息
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ de62c298
......@@ -262,10 +262,10 @@
<select id="selectCustomerBusinessList" resultType="com.dsk.system.domain.customer.vo.CustomerBusinessListVo">
select
bi.id, bi.project_name, pi.investment_amount, pi.project_stage, pi.status
bi.id, bi.project_name, bi.investment_amount, bi.project_stage, bi.status
from business_info bi
left join business_user bu on bi.id = bu.business_id
where bi.customer_id = #{customerId} and (bu.user_id = #{userId} or bi.is_private = 1))
where bi.customer_id = #{customerId} and (bu.user_id = #{userId} or bi.is_private = 1)
<if test="projectStage != null and projectStage != '' "> and bi.project_stage = #{projectStage}</if>
<if test="status != null "> and bi.status = #{status}</if>
order by bi.create_time desc
......
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