Commit 4a02f5b5 authored by neo's avatar neo

[bugfix] fixed task is to next station create attache not found task

parent ec03f7af
...@@ -39,10 +39,12 @@ public class ApprovalService { ...@@ -39,10 +39,12 @@ 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);
startAssignee(pa); startAssignee(pa);
createAttache(pa);
} }
...@@ -56,7 +58,6 @@ public class ApprovalService { ...@@ -56,7 +58,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,9 +92,9 @@ public class ApprovalService { ...@@ -91,9 +92,9 @@ public class ApprovalService {
pa.setTemplateIds(reportTemplateIds.toString()); pa.setTemplateIds(reportTemplateIds.toString());
pa.setStatus(Constant.APPROVAL_COMMITTED); pa.setStatus(Constant.APPROVAL_COMMITTED);
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();
...@@ -104,15 +105,24 @@ public class ApprovalService { ...@@ -104,15 +105,24 @@ public class ApprovalService {
map.put("committed", 0); map.put("committed", 0);
taskService.complete(task.getId(), map); taskService.complete(task.getId(), map);
} else {
logger.warn("task must not null or size eq 1");
}
}
private void createAttache(PeriodApprove pa) {
List<Task> tasks = taskService.createTaskQuery().taskAssignee(Constant.ASSIGNEE_MANAGER).processInstanceId(
pa.getInstanceId()).list();
if (tasks != null && tasks.size() == 1) {
Task task = tasks.get(0);
taskService.createAttachment("java.lang.String", task.getId(), task.getProcessInstanceId(), taskService.createAttachment("java.lang.String", task.getId(), task.getProcessInstanceId(),
"period_approval_uuid", pa.getId(), pa.getId()); "period_approval_uuid", pa.getId(), pa.getId());
periodApproveMapper.updateByPrimaryKeySelective(pa);
} else { } else {
logger.warn("task must not null or size eq 1"); logger.warn("task must not null or size eq 1");
} }
} }
@Transactional @Transactional
public void checkTask(String taskId, String decide) { public void checkTask(String taskId, String decide) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
......
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