Skip to content

D
dsk-cr20g
Commit 16ebbb0e authored by danfuman's avatar danfuman
Browse files
Options

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

parents fee18a2e 2f1e31fb
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 32 deletions
dsk-common/src/main/java/com/dsk/common/dtos/JskBidPlanDto.java
View file @ 16ebbb0e
......@@ -2,6 +2,8 @@ package com.dsk.common.dtos;
import lombok.Data;
import java.util.Date;
/**
* 组合查询参数
* @author Administrator
......@@ -48,13 +50,16 @@ public class JskBidPlanDto {
String projectCapitalSource;
//发布时间
String issueTime;
//发布时间开始
Date startIssueTime;
//发布时间结束
Date endIssueTime;
//计划发布开始时间
String planTenderDateStart;
//计划发布截止时间
String planTenderDateEnd;
//来源网站
String sourceName;
/**
* 修改时间
*/
......
dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicRegionalCompareDto.java
View file @ 16ebbb0e
package com.dsk.common.dtos;
import lombok.Data;
import cn.hutool.core.util.ObjectUtil;
import java.util.List;
......@@ -11,7 +11,6 @@ import java.util.List;
* @Date 2023/5/23 14:05
* @Version
*/
@Data
public class OpRegionalEconomicRegionalCompareDto {
/**
......@@ -20,4 +19,34 @@ public class OpRegionalEconomicRegionalCompareDto {
private Integer year;
private List<OpRegionalEconomicDataStatisticsRegionalDto> compareList;
public Integer getYear() {
return year;
}
public void setYear(Integer year) {
this.year = year;
}
public List<OpRegionalEconomicDataStatisticsRegionalDto> getCompareList() {
if (ObjectUtil.isNotEmpty(compareList)) {
for (OpRegionalEconomicDataStatisticsRegionalDto dataStatisticsRegionalDto : compareList) {
dataStatisticsRegionalDto.setYear(year);
}
}
return compareList;
}
public void setCompareList(List<OpRegionalEconomicDataStatisticsRegionalDto> compareList) {
this.compareList = compareList;
}
@Override
public String toString() {
return "OpRegionalEconomicRegionalCompareDto{" +
"year=" + year +
", compareList=" + compareList +
'}';
}
}
dsk-operate-ui/src/views/custom/customList/index.vue
View file @ 16ebbb0e
......@@ -365,7 +365,7 @@ export default {
let customerId = row.customerId
let companyId = row.companyId
let path = type
if(companyId == null){
if(type == "" && companyId == null){
path = 'business'
}
this.$router.push({path:'/enterprise/'+encodeStr(companyId),query:{customerId:customerId,path:path}})
......
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @ 16ebbb0e
......@@ -245,7 +245,7 @@ export default {
this.$nextTick(() => {
this.isCustomer = true
this.isCompany = false
this.currentPath.pathName = 'business'
this.currentPath.pathName = this.$route.query.path || 'business'
this.companyInfo = {
companyName: this.customerInfo.companyName
}
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 16ebbb0e
......@@ -132,7 +132,13 @@
<p>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span>导出EXCEL</span>
<el-popover
placement="top-end"
width="200"
trigger="hover"
content="功能正在开发中">
<span class="excel" slot="reference">导出EXCEL</span>
</el-popover>
</p>
</div>
......@@ -1101,6 +1107,9 @@ export default {
width: 18px;
height: 18px;
}
.excel{
cursor: pointer;
}
}
}
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ 16ebbb0e
......@@ -449,7 +449,13 @@
<p>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span>导出EXCEL</span>
<el-popover
placement="top-end"
width="200"
trigger="hover"
content="功能正在开发中">
<span class="excel" slot="reference">导出EXCEL</span>
</el-popover>
</p>
</div>
......@@ -2992,6 +2998,9 @@
width: 18px;
height: 18px;
}
.excel{
cursor: pointer;
}
}
}
......
dsk-operate-ui/src/views/project/projectList/detail.vue
View file @ 16ebbb0e
......@@ -14,7 +14,7 @@
<div class="titles">
<img src="@/assets/images/project/headimg.png" class="headimg">
<strong class="text">{{ProjectData.projectName}}</strong>
<div class="protypes i1" v-if="isDisabled == false">
<div class="protypes" :class="{'i1':ProjectData.status == 0,'i2':ProjectData.status == 1,'i3':ProjectData.status == 2}" v-if="isDisabled == false">
<span v-for="(item,index) in projectStatus"><i v-if="ProjectData.status == item.dictValue">{{item.dictLabel}}</i></span>
<el-select class="sels" v-model="ProjectData.status" @change="editXMSL({status:ProjectData.status})">
<el-option v-for="(item,index) in projectStatus" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
......
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ 16ebbb0e
......@@ -99,9 +99,9 @@
<div class="titles">项目明细
<div class="dc">
<div class="total">共{{total}}条</div>
<el-tooltip class="item" effect="dark" content="功能正在开发中" placement="top">
<div class="btn-export"><img src="@/assets/images/EXCEL.png">导出EXCEL</div>
</el-tooltip>
<!--<el-tooltip class="item" effect="dark" content="功能正在开发中" placement="top">-->
<div class="btn-export" @click="dc"><img src="@/assets/images/EXCEL.png">导出EXCEL</div>
<!--</el-tooltip>-->
</div>
</div>
<div class="tables" v-if="total == 0">
......@@ -261,6 +261,9 @@ export default {
})
},
methods: {
dc(){
this.$message.warning('功能正在开发中')
},
deldetail(index){
this.ondel = index
},
......
dsk-operate-ui/src/views/radar/Bidding/details.vue
View file @ 16ebbb0e
......@@ -25,7 +25,7 @@
<p class="list-content-text">
<span>招采单位：</span>
<span v-if="textList.tenderee">
<router-link :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.tendereeId) " tag="a" class="list-titel-a blue" v-html="scope.row.tenderee"></router-link>
<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>
</span>
<span v-else>--</span>
</p>
......
dsk-operate-ui/src/views/radar/Establishment/details.vue
View file @ 16ebbb0e
......@@ -49,7 +49,7 @@
<p>
<label class="label">项目法人</label>
<span>
<router-link v-if="textList.companyName" :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="textList.companyName" :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.companyId) " tag="a" class="list-titel-a blue" v-html="textList.companyName"></router-link>
<span v-else>--</span>
</span>
<label class="label">总投资（万元）</label>
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ 16ebbb0e
......@@ -454,7 +454,7 @@
</el-table-column>
<el-table-column prop="zj" label="招标人" width="280" >
<template slot-scope="scope">
<span class="list-titel-a" @click="getUipIdByCid(item.tendereeId)" v-html="item.tenderee">
<span class="list-titel-a" @click="getUipIdByCid(scope.row.tendereeId)" v-html="scope.row.tenderee">
</span>
</template>
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ 16ebbb0e
......@@ -111,10 +111,7 @@
<ul class="bottomlist-content" v-if="tableData.length>0">
<li class="bottomlist-list" v-for="item in tableData">
<p class="list-titel">
<span v-html="item.projectName" @click="getUipIdByCid(item.id)">
</span>
<router-link :to="'/radar/debtProject/details/'+ item.uuid" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
</p>
<div class="content-label" v-if="item.domicile">
......
dsk-operate-ui/src/views/radar/debtProject/details.vue
View file @ 16ebbb0e
......@@ -136,14 +136,14 @@
<div class="main4-box">
<label class="label">项目主体</label>
<span>
<router-link v-if="textList.projectEntity" :to="scope.row.projectEntityUipId?'/enterprise/' + encodeStr(scope.row.projectEntityUipId) :'/company/' + encodeStr(scope.row.projectEntityId) " tag="a" class="list-titel-a blue" v-html="scope.row.projectEntity"></router-link>
<router-link v-if="textList.projectEntity" :to="textList.projectEntityUipId?'/enterprise/' + encodeStr(textList.projectEntityUipId) :'/company/' + encodeStr(textList.projectEntityId) " tag="a" class="list-titel-a blue" v-html="textList.projectEntity"></router-link>
<template v-else>--</template>
</span>
<label class="label">主管部门</label>
<span>{{textList.chargeDepartment||'--'}}</span>
<label class="label">实施单位</label>
<span>
<router-link v-if="textList.piu" :to="scope.row.piuUipId?'/enterprise/' + encodeStr(scope.row.piuUipId) :'/company/' + encodeStr(scope.row.piuId) " tag="a" class="list-titel-a blue" v-html="scope.row.piu"></router-link>
<router-link v-if="textList.piu" :to="textList.piuUipId?'/enterprise/' + encodeStr(textList.piuUipId) :'/company/' + encodeStr(textList.piuId) " tag="a" class="list-titel-a blue" v-html="textList.piu"></router-link>
<template v-else>--</template>
</span>
</div>
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java
View file @ 16ebbb0e
......@@ -68,18 +68,25 @@ public class EnterpriseBussinessService {
contentParam.put("data_type", "kaibiao");
contentParam.put("filter_type", 2);
contentParam.put("strategy_id", mongoContentId);
Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
Map<String, Object> contentMap = null;
try {
contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
} catch (Exception e) {
data.put("content", e.getMessage());
map.put("data", data);
return BeanUtil.toBean(map, R.class);
}
Map contentData = MapUtils.getMap(contentMap, "data", null);
if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
data.put("content", JSONUtil.toJsonStr(contentMap));
map.put("data", data);
return BeanUtil.toBean(map, R.class);
}
String htmlContent = MapUtils.getString(contentData, "htmlContent");
data.put("content", htmlContent);
data.put("content", MapUtils.getString(contentData, "htmlContent"));
map.put("data", data);
return BeanUtil.toBean(map, R.class);
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java
View file @ 16ebbb0e
......@@ -131,21 +131,27 @@ public class EnterpriseProjectService {
}
HashMap<String, Object> contentParam = new HashMap<>();
contentParam.put("data_type", "bid_plan");
contentParam.put("data_type", "zhaobiao_new");
contentParam.put("filter_type", 2);
contentParam.put("strategy_id", contentId);
Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
Map<String, Object> contentMap = null;
try {
contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
} catch (Exception e) {
data.put("content", e.getMessage());
map.put("data", data);
return BeanUtil.toBean(map, R.class);
}
Map contentData = MapUtils.getMap(contentMap, "data", null);
if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
data.put("content", JSONUtil.toJsonStr(contentMap));
map.put("data", data);
return BeanUtil.toBean(map, R.class);
}
String htmlContent = MapUtils.getString(contentData, "htmlContent");
data.put("content", htmlContent);
data.put("content", MapUtils.getString(contentData, "htmlContent"));
map.put("data", data);
return BeanUtil.toBean(map, R.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