Skip to content

D
dsk-cr20g
Commit b327a977 authored by yht15023815643's avatar yht15023815643
Browse files
Options

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

parents afb3a119 903ce46b
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 104 deletions
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/EnterpriseProjectController.java
View file @ b327a977
...@@ -4,6 +4,7 @@ package com.dsk.jsk.controller; ...@@ -4,6 +4,7 @@ package com.dsk.jsk.controller;
import com.dsk.common.core.domain.R; import com.dsk.common.core.domain.R;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
import com.dsk.jsk.domain.*; import com.dsk.jsk.domain.*;
import com.dsk.jsk.domain.bo.EnterpriseProjectImportantListDto;
import com.dsk.jsk.service.EnterpriseProjectService; import com.dsk.jsk.service.EnterpriseProjectService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -163,4 +164,12 @@ public class EnterpriseProjectController { ...@@ -163,4 +164,12 @@ public class EnterpriseProjectController {
return enterpriseProjectService.projectProcess(body); return enterpriseProjectService.projectProcess(body);
} }
/**
* 企业重点项目列表
*/
@RequestMapping(value = "/importantList", method = RequestMethod.POST)
public TableDataInfo importantList(@RequestBody EnterpriseProjectImportantListDto dto) throws Exception {
return enterpriseProjectService.importantList(dto);
}
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/bo/EnterpriseProjectImportantListDto.java 0 → 100644
View file @ b327a977
package com.dsk.jsk.domain.bo;
import com.dsk.jsk.domain.BasePage;
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 EnterpriseProjectImportantListDto extends BasePage {
private Integer companyId;
private String keys;
private String projectLevel;
private String projectType;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseProjectService.java
View file @ b327a977
package com.dsk.jsk.service; package com.dsk.jsk.service;
import cn.hutool.core.bean.BeanException;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
...@@ -7,6 +8,7 @@ import com.dsk.common.core.domain.R; ...@@ -7,6 +8,7 @@ import com.dsk.common.core.domain.R;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
import com.dsk.common.utils.DskOpenApiUtil; import com.dsk.common.utils.DskOpenApiUtil;
import com.dsk.jsk.domain.*; import com.dsk.jsk.domain.*;
import com.dsk.jsk.domain.bo.EnterpriseProjectImportantListDto;
import org.apache.commons.collections4.MapUtils; import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -217,4 +219,10 @@ public class EnterpriseProjectService { ...@@ -217,4 +219,10 @@ public class EnterpriseProjectService {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/recruitmentMarket/projectProcess", BeanUtil.beanToMap(body, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/recruitmentMarket/projectProcess", BeanUtil.beanToMap(body, false, false));
return BeanUtil.toBean(map, R.class); return BeanUtil.toBean(map, R.class);
} }
public TableDataInfo importantList(EnterpriseProjectImportantListDto dto) throws Exception{
if(ObjectUtil.isEmpty(dto.getCompanyId())) throw new BeanException("企业id不能为空！");
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/importantList", BeanUtil.beanToMap(dto, false, false));
return dskOpenApiUtil.responsePage(map);
}
} }
dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue
View file @ b327a977
<template> <template>
<div> <div>
<div class="headForm" v-if="title === '集团业绩'"> <div class="headForm">
<div class="flex-box query-box" style="margin-bottom: 12px;"> <div class="flex-box query-box" style="margin-bottom: 12px;">
<div class="flex-box query-params"> <div class="flex-box query-params">
<span class="common-title" v-if="title">{{ title }}</span> <span class="common-title" v-if="title">{{ title }}</span>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</template> </template>
<div v-else class="flex-box"> <div v-else class="flex-box">
<span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span> <span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>
<span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel && title ==='集团业绩'" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
<span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div> </div>
</div> </div>
...@@ -108,110 +108,110 @@ ...@@ -108,110 +108,110 @@
</div> </div>
</div> </div>
</div> </div>
<div class="headForm" v-else> <!--<div class="headForm" v-else>-->
<div class="flex-box query-box"> <!--<div class="flex-box query-box">-->
<div class="flex-box query-params"> <!--<div class="flex-box query-params">-->
<span class="common-title" v-if="title">{{ title }}</span> <!--<span class="common-title" v-if="title">{{ title }}</span>-->
<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">-->
<!-- 单选 --> <!--&lt;!&ndash; 单选 &ndash;&gt;-->
<template v-if="form.type==1"> <!--<template v-if="form.type==1">-->
<el-select <!--<el-select-->
v-model="form.value" <!--v-model="form.value"-->
clearable <!--clearable-->
class="form-content-width" <!--class="form-content-width"-->
:style="form.width?'width:'+form.width+'px':'max-width: 110px'" <!--:style="form.width?'width:'+form.width+'px':'max-width: 110px'"-->
:placeholder="form.placeholder" <!--:placeholder="form.placeholder"-->
@change="changeSelect"> <!--@change="changeSelect">-->
<el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" :disabled="item.disabled"/> <!--<el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" :disabled="item.disabled"/>-->
</el-select> <!--</el-select>-->
</template> <!--</template>-->
<!-- 年月日 --> <!--&lt;!&ndash; 年月日 &ndash;&gt;-->
<template v-if="form.type==2"> <!--<template v-if="form.type==2">-->
<el-date-picker <!--<el-date-picker-->
@change="changeSelect" <!--@change="changeSelect"-->
class="fromTime" <!--class="fromTime"-->
style="width: 210px" <!--style="width: 210px"-->
v-model="form.value" <!--v-model="form.value"-->
type="daterange" <!--type="daterange"-->
prefix-icon="fromTime-icon" <!--prefix-icon="fromTime-icon"-->
value-format="yyyy-MM-dd" <!--value-format="yyyy-MM-dd"-->
range-separator="至" <!--range-separator="至"-->
start-placeholder="开始日期" <!--start-placeholder="开始日期"-->
end-placeholder="结束日期"> <!--end-placeholder="结束日期">-->
</el-date-picker> <!--</el-date-picker>-->
</template> <!--</template>-->
<!-- 输入框 --> <!--&lt;!&ndash; 输入框 &ndash;&gt;-->
<template v-if="form.type==3"> <!--<template v-if="form.type==3">-->
<div class="cooperate-name" :id="'focus'+i"> <!--<div class="cooperate-name" :id="'focus'+i">-->
<el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input> <!--<el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+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>-->
<!-- 多选 --> <!--&lt;!&ndash; 多选 &ndash;&gt;-->
<template v-if="form.type==4"> <!--<template v-if="form.type==4">-->
<el-select <!--<el-select-->
class="form-content-width" <!--class="form-content-width"-->
:class="form.value.length > 1 ? 'selectTag' : ''" <!--:class="form.value.length > 1 ? 'selectTag' : ''"-->
v-model="form.value" <!--v-model="form.value"-->
multiple <!--multiple-->
collapse-tags <!--collapse-tags-->
clearable <!--clearable-->
:style="form.width?'width:'+form.width+'px':'max-width: 170px'" <!--:style="form.width?'width:'+form.width+'px':'max-width: 170px'"-->
:placeholder="form.placeholder" <!--:placeholder="form.placeholder"-->
@change="changeSelect"> <!--@change="changeSelect">-->
<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>-->
<!-- 时间、自定义 --> <!--&lt;!&ndash; 时间、自定义 &ndash;&gt;-->
<template v-else-if="form.type==5"> <!--<template v-else-if="form.type==5">-->
<custom-time-select <!--<custom-time-select-->
:timeList="form.timeList" <!--:timeList="form.timeList"-->
v-model="form.value" <!--v-model="form.value"-->
:placeholder="form.placeholder" <!--:placeholder="form.placeholder"-->
:dateFrom="form.dateFrom ? form.dateFrom : ''" <!--:dateFrom="form.dateFrom ? form.dateFrom : ''"-->
:dateTo="form.dateTo ? form.dateTo : ''" <!--:dateTo="form.dateTo ? form.dateTo : ''"-->
@handle-search="changeSelect" /> <!--@handle-search="changeSelect" />-->
</template> <!--</template>-->
<!-- 金额 --> <!--&lt;!&ndash; 金额 &ndash;&gt;-->
<template v-else-if="form.type==6"> <!--<template v-else-if="form.type==6">-->
<custom-money-select <!--<custom-money-select-->
:moneyList="form.moneyList" <!--:moneyList="form.moneyList"-->
v-model="form.value" <!--v-model="form.value"-->
:placeholder="form.placeholder" <!--:placeholder="form.placeholder"-->
@handle-search="changeSelect" /> <!--@handle-search="changeSelect" />-->
</template> <!--</template>-->
<!-- 地区选择 --> <!--&lt;!&ndash; 地区选择 &ndash;&gt;-->
<template v-else-if="form.type==7"> <!--<template v-else-if="form.type==7">-->
<el-cascader <!--<el-cascader-->
ref="cascader" <!--ref="cascader"-->
:options="form.options" <!--:options="form.options"-->
:props="form.props" <!--:props="form.props"-->
v-model="form.value" <!--v-model="form.value"-->
@change="changeSelect" <!--@change="changeSelect"-->
:placeholder="form.placeholder" <!--:placeholder="form.placeholder"-->
collapse-tags <!--collapse-tags-->
clearable></el-cascader> <!--clearable></el-cascader>-->
</template> <!--</template>-->
<!-- 自定义 --> <!--&lt;!&ndash; 自定义 &ndash;&gt;-->
<template v-if="form.type==0"> <!--<template v-if="form.type==0">-->
<slot name="slot"></slot> <!--<slot name="slot"></slot>-->
</template> <!--</template>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
<template v-if="slots"> <!--<template v-if="slots">-->
<slot name="slot"></slot> <!--<slot name="slot"></slot>-->
</template> <!--</template>-->
<div v-else class="flex-box"> <!--<div v-else class="flex-box">-->
<span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span> <!--<span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>-->
<span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel && title ==='集团业绩'" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <!--<span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel && title ==='集团业绩'" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>-->
<span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <!--<span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> <!--</div>-->
</div> </div>
......
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