Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
indicators
Overview
Overview
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
zhangkb
indicators
Commits
4ecafe1b
Commit
4ecafe1b
authored
Nov 19, 2020
by
hzc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加下发人查询条件
parent
3dbb0ca3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
ShortboardTaskCtrl.java
...eymobile/indicators/api/hytobacco/ShortboardTaskCtrl.java
+5
-8
ShortboardParam.java
...e/indicators/model/entity/shortboard/ShortboardParam.java
+2
-0
ShortboardTaskMapper.xml
src/main/resources/mybatis/mapping/ShortboardTaskMapper.xml
+3
-0
No files found.
src/main/java/com/keymobile/indicators/api/hytobacco/ShortboardTaskCtrl.java
View file @
4ecafe1b
...
...
@@ -43,23 +43,20 @@ public class ShortboardTaskCtrl {
PageRequest
request
=
PageRequest
.
of
(
shortboardParam
.
getPage
()-
1
,
shortboardParam
.
getSize
());
shortboardParam
.
setOffset
(
request
.
getOffset
());
List
<
ShortBoardTask
>
lists
=
new
ArrayList
<>();
if
(
StringUtils
.
isNotBlank
(
shortboardParam
.
getUserId
())){
//userId不为空
String
currentUserId
=
SystemUserUtil
.
getCurrentUserId
();
shortboardParam
.
setUserId
(
currentUserId
);
}
long
count
=
shortboardTaskService
.
selectCountByParam
(
shortboardParam
);
if
(
count
>
0
){
lists
=
shortboardTaskService
.
selectPageByParam
(
shortboardParam
);
}
String
message
=
SystemUserUtil
.
getCurrentUser
()+
"查找了我的检查改善措施 "
;
if
(
shortboardParam
.
getStatusArr
().
length
==
2
){
message
=
SystemUserUtil
.
getCurrentUser
()+
"查找了我的短板任务清单 "
;
}
LogManager
.
logInfo
(
Constants
.
LOG_INDICATOR_SHORTBOARD_TASK_API
,
message
);
// String message = SystemUserUtil.getCurrentUser()+"查找了我的检查改善措施 ";
// if(shortboardParam.getStatusArr().length==2){
// message = SystemUserUtil.getCurrentUser()+"查找了我的短板任务清单或者检查改善措施 ";
// }
// LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_TASK_API,message);
return
new
PageImpl
<>(
lists
,
request
,
count
);
}
...
...
src/main/java/com/keymobile/indicators/model/entity/shortboard/ShortboardParam.java
View file @
4ecafe1b
...
...
@@ -24,4 +24,6 @@ public class ShortboardParam {
private
Integer
unitId
;
@ApiModelProperty
(
"用户id"
)
private
String
userId
;
@ApiModelProperty
(
"下发人id"
)
private
String
createUserId
;
}
src/main/resources/mybatis/mapping/ShortboardTaskMapper.xml
View file @
4ecafe1b
...
...
@@ -70,6 +70,9 @@
<if
test=
"userId !=null and userId != ''"
>
and sbt.enter_user_id like concat('%,',#{userId},',%')
</if>
<if
test=
"createUserId !=null and createUserId!=''"
>
and sbt.createUser_id = #{createUserId}
</if>
</sql>
...
...
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