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
ec03f7af
Commit
ec03f7af
authored
Oct 24, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] cannot use instance and assign with same transcition
parent
ae7d669e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
ApprovalService.java
...va/pwc/taxtech/atms/vat/service/impl/ApprovalService.java
+2
-2
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ApprovalService.java
View file @
ec03f7af
...
@@ -39,7 +39,6 @@ public class ApprovalService {
...
@@ -39,7 +39,6 @@ public class ApprovalService {
@Autowired
@Autowired
PeriodReportMapper
reportMapper
;
PeriodReportMapper
reportMapper
;
@Transactional
public
void
startInstanceAndAssignee
(
ApprovalDto
dto
)
{
public
void
startInstanceAndAssignee
(
ApprovalDto
dto
)
{
PeriodApprove
pa
=
new
PeriodApprove
();
PeriodApprove
pa
=
new
PeriodApprove
();
startInstance
(
dto
,
pa
);
startInstance
(
dto
,
pa
);
...
@@ -57,6 +56,7 @@ public class ApprovalService {
...
@@ -57,6 +56,7 @@ public class ApprovalService {
return
list
;
return
list
;
}
}
@Transactional
private
void
startInstance
(
ApprovalDto
dto
,
PeriodApprove
pa
)
{
private
void
startInstance
(
ApprovalDto
dto
,
PeriodApprove
pa
)
{
PeriodReportExample
pre
=
new
PeriodReportExample
();
PeriodReportExample
pre
=
new
PeriodReportExample
();
pre
.
createCriteria
().
andProjectIdEqualTo
(
dto
.
getProjectId
()).
andPeriodEqualTo
(
dto
.
getPeriod
());
pre
.
createCriteria
().
andProjectIdEqualTo
(
dto
.
getProjectId
()).
andPeriodEqualTo
(
dto
.
getPeriod
());
...
@@ -93,7 +93,7 @@ public class ApprovalService {
...
@@ -93,7 +93,7 @@ public class ApprovalService {
pa
.
setProjectId
(
dto
.
getProjectId
());
pa
.
setProjectId
(
dto
.
getProjectId
());
periodApproveMapper
.
insert
(
pa
);
periodApproveMapper
.
insert
(
pa
);
}
}
@Transactional
private
void
startAssignee
(
PeriodApprove
pa
)
{
private
void
startAssignee
(
PeriodApprove
pa
)
{
List
<
Task
>
tasks
=
taskService
.
createTaskQuery
().
taskAssignee
(
Constant
.
ASSIGNEE_ACCOUNTANT
).
processInstanceId
(
List
<
Task
>
tasks
=
taskService
.
createTaskQuery
().
taskAssignee
(
Constant
.
ASSIGNEE_ACCOUNTANT
).
processInstanceId
(
pa
.
getInstanceId
()).
list
();
pa
.
getInstanceId
()).
list
();
...
...
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