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
8bd60642
Commit
8bd60642
authored
Sep 25, 2020
by
hzc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加在线填报字数的限制,增加预警池的筛选添加userid
parent
e8b06ec1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
4 deletions
+24
-4
ShortboardTaskCtrl.java
...eymobile/indicators/api/hytobacco/ShortboardTaskCtrl.java
+6
-2
ShortBoardTask.java
...le/indicators/model/entity/shortboard/ShortBoardTask.java
+2
-2
ShortboardTaskService.java
...e/indicators/service/hytobacco/ShortboardTaskService.java
+12
-0
ShortboardUnitService.java
...e/indicators/service/hytobacco/ShortboardUnitService.java
+1
-0
ShortboardRecordMapper.xml
...main/resources/mybatis/mapping/ShortboardRecordMapper.xml
+3
-0
No files found.
src/main/java/com/keymobile/indicators/api/hytobacco/ShortboardTaskCtrl.java
View file @
8bd60642
...
@@ -36,7 +36,7 @@ public class ShortboardTaskCtrl {
...
@@ -36,7 +36,7 @@ public class ShortboardTaskCtrl {
return
shortboardTaskService
.
assignShortboard
(
shortBoardTask
);
return
shortboardTaskService
.
assignShortboard
(
shortBoardTask
);
}
}
@ApiOperation
(
value
=
"查询短板清单
"
,
notes
=
"查询短板清单
"
)
@ApiOperation
(
value
=
"查询短板清单
或检查改善措施"
,
notes
=
"查询短板清单 statusArr[1,5] 检查改善措施statusArr[2,3,4]
"
)
@PostMapping
(
"find"
)
@PostMapping
(
"find"
)
public
Page
<
ShortBoardTask
>
find
(
@RequestBody
ShortboardParam
shortboardParam
){
public
Page
<
ShortBoardTask
>
find
(
@RequestBody
ShortboardParam
shortboardParam
){
...
@@ -54,7 +54,11 @@ public class ShortboardTaskCtrl {
...
@@ -54,7 +54,11 @@ public class ShortboardTaskCtrl {
if
(
count
>
0
){
if
(
count
>
0
){
lists
=
shortboardTaskService
.
selectPageByParam
(
shortboardParam
);
lists
=
shortboardTaskService
.
selectPageByParam
(
shortboardParam
);
}
}
String
message
=
SystemUserUtil
.
getCurrentUser
()+
"查找了我的短板任务清单 "
;
String
message
=
SystemUserUtil
.
getCurrentUser
()+
"查找了我的检查改善措施 "
;
if
(
shortboardParam
.
getStatusArr
().
length
==
2
){
message
=
SystemUserUtil
.
getCurrentUser
()+
"查找了我的短板任务清单 "
;
}
LogManager
.
logInfo
(
Constants
.
LOG_INDICATOR_SHORTBOARD_TASK_API
,
message
);
LogManager
.
logInfo
(
Constants
.
LOG_INDICATOR_SHORTBOARD_TASK_API
,
message
);
return
new
PageImpl
<>(
lists
,
request
,
count
);
return
new
PageImpl
<>(
lists
,
request
,
count
);
}
}
...
...
src/main/java/com/keymobile/indicators/model/entity/shortboard/ShortBoardTask.java
View file @
8bd60642
...
@@ -78,7 +78,7 @@ public class ShortBoardTask implements Serializable {
...
@@ -78,7 +78,7 @@ public class ShortBoardTask implements Serializable {
/**
/**
* 下发人
* 下发人
*/
*/
@ApiModelProperty
(
"下发人"
)
@ApiModelProperty
(
"下发人
多个用逗号分隔
"
)
@Column
(
name
=
"create_user"
)
@Column
(
name
=
"create_user"
)
private
String
createUser
;
private
String
createUser
;
/**
/**
...
@@ -90,7 +90,7 @@ public class ShortBoardTask implements Serializable {
...
@@ -90,7 +90,7 @@ public class ShortBoardTask implements Serializable {
/**
/**
* 接收人id
* 接收人id
*/
*/
@ApiModelProperty
(
"接收人id"
)
@ApiModelProperty
(
"接收人id
多个用逗号分隔(id前后都要有逗号,如 ,id,)
"
)
@Column
(
name
=
"enter_user_id"
)
@Column
(
name
=
"enter_user_id"
)
private
String
enterUserId
;
private
String
enterUserId
;
...
...
src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardTaskService.java
View file @
8bd60642
...
@@ -110,6 +110,18 @@ public class ShortboardTaskService {
...
@@ -110,6 +110,18 @@ public class ShortboardTaskService {
shortBoardTaskVal
.
setUpdateTime
(
date
);
shortBoardTaskVal
.
setUpdateTime
(
date
);
shortBoardTaskVal
.
setUpdater
(
SystemUserUtil
.
getCurrentUser
());
shortBoardTaskVal
.
setUpdater
(
SystemUserUtil
.
getCurrentUser
());
String
message
=
""
;
String
message
=
""
;
//在线填报限制字数
if
(!
isExcel
){
if
(
StringUtils
.
isNotBlank
(
shortBoardTaskVal
.
getAnalysisCauses
())&&
shortBoardTaskVal
.
getAnalysisCauses
().
length
()>
500
){
return
Result
.
genFailedResult
(
"短板原因分析字数要求500字内!"
);
}
else
if
(
StringUtils
.
isNotBlank
(
shortBoardTaskVal
.
getCreateMeasure
())&&
shortBoardTaskVal
.
getCreateMeasure
().
length
()>
500
){
return
Result
.
genFailedResult
(
"制定改善措施要求500字内!"
);
}
else
if
(
StringUtils
.
isNotBlank
(
shortBoardTaskVal
.
getStartMeasure
())&&
shortBoardTaskVal
.
getStartMeasure
().
length
()>
500
){
return
Result
.
genFailedResult
(
"执行改善措施要求500字内!"
);
}
}
if
(
shortBoardTaskVal
.
getId
()!=
null
&&
shortBoardTaskVal
.
getId
()!=
0
){
if
(
shortBoardTaskVal
.
getId
()!=
null
&&
shortBoardTaskVal
.
getId
()!=
0
){
//更新
//更新
shortboardTaskValMapper
.
updateByPrimaryKey
(
shortBoardTaskVal
);
shortboardTaskValMapper
.
updateByPrimaryKey
(
shortBoardTaskVal
);
...
...
src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardUnitService.java
View file @
8bd60642
...
@@ -140,6 +140,7 @@ public class ShortboardUnitService {
...
@@ -140,6 +140,7 @@ public class ShortboardUnitService {
int
start
=
page
*
rows
;
int
start
=
page
*
rows
;
paramMap
.
put
(
"start"
,
start
);
paramMap
.
put
(
"start"
,
start
);
paramMap
.
put
(
"end"
,
rows
);
paramMap
.
put
(
"end"
,
rows
);
paramMap
.
put
(
"userId"
,
SystemUserUtil
.
getCurrentUserId
());
List
<
ShortboardRecord
>
resultList
=
shortboardRecordMapper
.
getPageByCodeIn
(
paramMap
);
List
<
ShortboardRecord
>
resultList
=
shortboardRecordMapper
.
getPageByCodeIn
(
paramMap
);
result
.
put
(
"total"
,
count
);
result
.
put
(
"total"
,
count
);
...
...
src/main/resources/mybatis/mapping/ShortboardRecordMapper.xml
View file @
8bd60642
...
@@ -8,6 +8,9 @@
...
@@ -8,6 +8,9 @@
<foreach
item=
"id"
collection=
"codes"
open=
"("
close=
")"
separator=
","
>
<foreach
item=
"id"
collection=
"codes"
open=
"("
close=
")"
separator=
","
>
#{id}
#{id}
</foreach>
</foreach>
<if
test=
"userId != null and userId !=''"
>
and user_id = #{userId}
</if>
order by last_update_time desc
order by last_update_time desc
limit #{start},#{end}
limit #{start},#{end}
</select>
</select>
...
...
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