Commit ae7d669e authored by neo's avatar neo

[bugfix] not set projectid when insert approval

parent 33775a6b
...@@ -39,7 +39,7 @@ public class ApprovalService { ...@@ -39,7 +39,7 @@ 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,7 +57,6 @@ public class ApprovalService { ...@@ -57,7 +57,6 @@ 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());
...@@ -91,10 +90,10 @@ public class ApprovalService { ...@@ -91,10 +90,10 @@ public class ApprovalService {
pa.setReportIds(reportIds.toString()); pa.setReportIds(reportIds.toString());
pa.setTemplateIds(reportTemplateIds.toString()); pa.setTemplateIds(reportTemplateIds.toString());
pa.setStatus(Constant.APPROVAL_COMMITTED); pa.setStatus(Constant.APPROVAL_COMMITTED);
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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment