Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
dab6c28f
Commit
dab6c28f
authored
Nov 12, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DEV] update approval status and comment to db
parent
89fcee22
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
ApprovalController.java
.../java/pwc/taxtech/atms/controller/ApprovalController.java
+2
-2
ApprovalService.java
...va/pwc/taxtech/atms/vat/service/impl/ApprovalService.java
+5
-3
No files found.
atms-api/src/main/java/pwc/taxtech/atms/controller/ApprovalController.java
View file @
dab6c28f
...
...
@@ -66,8 +66,8 @@ public class ApprovalController {
@ResponseBody
@RequestMapping
(
value
=
"/check/{taskId}"
)
public
void
check
(
@PathVariable
String
taskId
,
@RequestParam
String
decide
)
{
//only for manager role
approvalService
.
checkTask
(
taskId
,
decide
);
public
void
check
(
@PathVariable
String
taskId
,
@RequestParam
String
decide
,
@RequestParam
String
comment
)
{
//only for manager role
approvalService
.
checkTask
(
taskId
,
decide
,
comment
);
}
@RequestMapping
(
value
=
"/show/{procDefId}"
)
//获取流程图
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ApprovalService.java
View file @
dab6c28f
...
...
@@ -125,7 +125,7 @@ public class ApprovalService {
@Transactional
public
void
checkTask
(
String
taskId
,
String
decide
)
{
public
void
checkTask
(
String
taskId
,
String
decide
,
String
comment
)
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
PeriodApprove
pa
=
new
PeriodApprove
();
switch
(
decide
)
{
...
...
@@ -147,8 +147,10 @@ public class ApprovalService {
pa
.
setId
(
uuid
);
periodApproveMapper
.
updateByPrimaryKeySelective
(
pa
);
PeriodApprove
result
=
periodApproveMapper
.
selectByPrimaryKey
(
uuid
);
//save report on service
pa
.
setApprovalBy
(
"Admin"
);
pa
.
setApprovalTime
(
new
Date
());
pa
.
setApprovalResualt
(
comment
);
periodApproveMapper
.
selectByPrimaryKey
(
uuid
);
}
else
{
logger
.
warn
(
"task must not null or size gt 1"
);
}
...
...
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