Commit 5248fb66 authored by 施翔轲's avatar 施翔轲

咨询机构管理:获取所有项目列表数据优化

parent ce2d397f
...@@ -39,6 +39,11 @@ public class AddAdvisoryBodyBo { ...@@ -39,6 +39,11 @@ public class AddAdvisoryBodyBo {
*/ */
@NotBlank(message = "经营范围不能为空") @NotBlank(message = "经营范围不能为空")
private String businessScope; private String businessScope;
/**
* 合作时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date cooperatorDate;
/** /**
* 项目负责人 * 项目负责人
*/ */
......
package com.dsk.cscec.domain.vo; package com.dsk.cscec.domain.vo;
import com.dsk.cscec.domain.AdvisoryBody; import com.dsk.cscec.domain.AdvisoryBody;
import com.dsk.cscec.domain.AdvisoryBodyProject;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -57,6 +58,11 @@ public class ProjectSearchVo { ...@@ -57,6 +58,11 @@ public class ProjectSearchVo {
*/ */
private String projectType; private String projectType;
/**
* 项目与咨询机构关系
*/
private AdvisoryBodyProject advisoryBodyProject;
/** /**
* 合同金额 * 合同金额
*/ */
......
...@@ -85,6 +85,9 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject> ...@@ -85,6 +85,9 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
//补充咨询机构信息 //补充咨询机构信息
projectSearchVo.setAdvisoryBody(this.getAdvisoryBodyByProjectKey(projectSearchVo.getProjectKey())); projectSearchVo.setAdvisoryBody(this.getAdvisoryBodyByProjectKey(projectSearchVo.getProjectKey()));
//补充项目与咨询机构关联信息
projectSearchVo.setAdvisoryBodyProject(advisoryBodyProjectMapper.selectById(projectSearchVo.getProjectKey()));
//关键字标红 //关键字标红
if (StringUtils.isNotBlank(projectSearchBo.getProjectName())) { if (StringUtils.isNotBlank(projectSearchBo.getProjectName())) {
projectSearchVo.setProjectName(StringUtils.markInRed(projectSearchVo.getProjectName(), projectSearchBo.getProjectName())); projectSearchVo.setProjectName(StringUtils.markInRed(projectSearchVo.getProjectName(), projectSearchBo.getProjectName()));
......
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