Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
李苗
/
Vion-DevOps
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit f21881fd
authored
Jan 02, 2024
by
HlQ
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
[chg] 重点项目看板负责人字段返回优化
1 parent
b3cd91f9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
src/main/java/vion/service/impl/StoreServiceImpl.java
src/main/java/vion/vo/StoreVO.java
src/main/java/vion/service/impl/StoreServiceImpl.java
View file @
f21881f
...
@@ -216,13 +216,11 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
...
@@ -216,13 +216,11 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
public
List
<
StoreVO
>
storeScreen
()
{
public
List
<
StoreVO
>
storeScreen
()
{
MPJLambdaWrapper
<
Store
>
wrapper
=
new
MPJLambdaWrapper
<
Store
>()
MPJLambdaWrapper
<
Store
>
wrapper
=
new
MPJLambdaWrapper
<
Store
>()
.
select
(
Store:
:
getTaskDetail
,
Store:
:
getFinishDate
,
Store:
:
getPercentage
,
Store:
:
getStuckPoint
,
Store:
:
getIsImportant
)
.
select
(
Store:
:
getTaskDetail
,
Store:
:
getFinishDate
,
Store:
:
getPercentage
,
Store:
:
getStuckPoint
,
Store:
:
getIsImportant
)
.
selectCollection
(
RStoreUser
.
class
,
StoreVO:
:
getStoreUserList
)
.
selectCollection
(
User
.
class
,
StoreVO:
:
getUserNameList
,
map
->
map
.
result
(
User:
:
getUsername
))
.
selectCollection
(
StoreLog
.
class
,
StoreVO:
:
getStoreLog
)
.
leftJoin
(
RStoreUser
.
class
,
on
->
on
.
eq
(
RStoreUser:
:
getStoreId
,
Store:
:
getId
).
eq
(
RStoreUser:
:
getIsMain
,
1
))
.
leftJoin
(
RStoreUser
.
class
,
on
->
on
.
eq
(
RStoreUser:
:
getStoreId
,
Store:
:
getId
).
eq
(
RStoreUser:
:
getIsMain
,
1
))
.
leftJoin
(
StoreLog
.
class
,
StoreLog:
:
getStoreId
,
Store:
:
get
Id
)
.
leftJoin
(
User
.
class
,
User:
:
getId
,
RStoreUser:
:
getUser
Id
)
.
eq
(
Store:
:
getIsImportant
,
1
)
.
eq
(
Store:
:
getIsImportant
,
1
)
.
orderByAsc
(
Store:
:
getFinishDate
)
.
orderByAsc
(
Store:
:
getFinishDate
);
.
orderByDesc
(
StoreLog:
:
getCreateTime
);
return
this
.
selectJoinList
(
StoreVO
.
class
,
wrapper
);
return
this
.
selectJoinList
(
StoreVO
.
class
,
wrapper
);
}
}
}
}
src/main/java/vion/vo/StoreVO.java
View file @
f21881f
...
@@ -2,7 +2,6 @@ package vion.vo;
...
@@ -2,7 +2,6 @@ package vion.vo;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
lombok.Data
;
import
vion.model.RStoreUser
;
import
vion.model.StoreLog
;
import
vion.model.StoreLog
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -56,7 +55,7 @@ public class StoreVO {
...
@@ -56,7 +55,7 @@ public class StoreVO {
/** 当前卡点 */
/** 当前卡点 */
private
String
stuckPoint
;
private
String
stuckPoint
;
private
List
<
RStoreUser
>
storeUser
List
;
private
List
<
String
>
userName
List
;
private
List
<
StoreLog
>
storeLog
;
private
List
<
StoreLog
>
storeLog
;
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment