Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fulixin
dsk-operate-sys-cscec
Commits
5248fb66
Commit
5248fb66
authored
Dec 28, 2023
by
施翔轲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
咨询机构管理:获取所有项目列表数据优化
parent
ce2d397f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
0 deletions
+14
-0
AddAdvisoryBodyBo.java
.../main/java/com/dsk/cscec/domain/bo/AddAdvisoryBodyBo.java
+5
-0
ProjectSearchVo.java
...rc/main/java/com/dsk/cscec/domain/vo/ProjectSearchVo.java
+6
-0
IDProjectServiceImpl.java
...java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java
+3
-0
No files found.
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AddAdvisoryBodyBo.java
View file @
5248fb66
...
@@ -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
;
/**
/**
* 项目负责人
* 项目负责人
*/
*/
...
...
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/ProjectSearchVo.java
View file @
5248fb66
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
;
/**
/**
* 合同金额
* 合同金额
*/
*/
...
...
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java
View file @
5248fb66
...
@@ -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
()));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment