Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes
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
ximai
mes
Commits
d5baa989
Commit
d5baa989
authored
Nov 25, 2024
by
李驰骋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报工查询子查询不分页
parent
3a37336d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
ProFeedbackController.java
...a/com/ximai/mes/pro/controller/ProFeedbackController.java
+2
-1
No files found.
mes/src/main/java/com/ximai/mes/pro/controller/ProFeedbackController.java
View file @
d5baa989
...
...
@@ -65,7 +65,6 @@ public class ProFeedbackController extends BaseController {
public
TableDataInfo
<
ProFeedbackVo
>
list
(
ProFeedbackCheckListDto
proFeedbackCheckListDto
)
{
ProFeedback
proFeedback
=
new
ProFeedback
();
BeanUtils
.
copyProperties
(
proFeedbackCheckListDto
,
proFeedback
);
startPage
();
QueryWrapper
<
ProFeedback
>
query
=
new
QueryWrapper
<>();
query
.
eq
(
StringUtils
.
isNotEmpty
(
proFeedback
.
getFeedbackType
()),
"f.feedback_type"
,
proFeedback
.
getFeedbackType
());
query
.
eq
(
StringUtils
.
isNotEmpty
(
proFeedback
.
getStatus
()),
"f.status"
,
proFeedback
.
getStatus
());
...
...
@@ -78,6 +77,7 @@ public class ProFeedbackController extends BaseController {
// query.eq(StringUtils.isNotEmpty(proFeedback.getUserId()), "pww.user_id", proFeedback.getUserId());
query
.
eq
(
StringUtils
.
isNotEmpty
(
proFeedback
.
getWorkunitId
()),
"tw.workunit_id"
,
proFeedback
.
getWorkunitId
());
if
(
proFeedbackCheckListDto
.
getIsCheckUser
()
&&
StringUtils
.
isEmpty
(
proFeedback
.
getWorkunitId
())){
List
<
MdWorkunitVo
>
mdWorkunitVolist
=
mdWorkunitService
.
selectMdWorkunitListByUser
(
new
QueryWrapper
<
MdWorkunit
>().
eq
(
"user_name"
,
SecurityUtils
.
getUsername
()));
if
(
mdWorkunitVolist
.
size
()
<
1
)
return
getDataTable
(
new
ArrayList
<>());
...
...
@@ -88,6 +88,7 @@ public class ProFeedbackController extends BaseController {
query
.
like
(
StringUtils
.
isNotEmpty
(
proFeedback
.
getNickName
()),
"f.nick_name"
,
proFeedback
.
getNickName
());
query
.
notIn
(
"tw.status"
,
TaskWorkunitStatusEnum
.
CLOSE
.
getStatus
());
query
.
orderByAsc
(
"f.feedback_time"
);
startPage
();
List
<
ProFeedbackVo
>
list
=
proFeedbackService
.
queryProFeedbackListJoinTaskWorkUnit
(
query
);
List
<
ProFeedbackVo
>
proFeedbackVoList
=
new
ArrayList
<>();
if
(
proFeedback
.
getUserId
()
!=
null
)
{
...
...
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