Commit c6d6c9ed authored by ken-y's avatar ken-y

fix report approve----Ken

parent 81132176
package pwc.taxtech.atms.vat.service.impl;
import java.util.Date;
import org.activiti.engine.HistoryService;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.RuntimeService;
......@@ -222,7 +220,7 @@ public class ApprovalService {
pa.setId(approve.getId());
switch (decide) {
case Constant.APPROVAL_AGREED:
pa.setStatus(Constant.APPROVAL_AGREED);
pa.setStatus(Constant.APPROVAL_COMMITTED);
map.put("decide", 1);
break;
case Constant.APPROVAL_DISAGREED:
......@@ -261,13 +259,13 @@ public class ApprovalService {
tasks1 = taskService.createTaskQuery().taskName(Constant.ROLE_TAX_BP).processInstanceId(
instanceId).list();
if (tasks1 != null && tasks1.size() == 1) {
repositoryService.deleteDeployment(tasks1.get(0).getId());
runtimeService.deleteProcessInstance(tasks1.get(0).getProcessInstanceId(),comment);
}
}else{
tasks1 = taskService.createTaskQuery().taskName(Constant.ROLE_COMPLIANCE_IA).processInstanceId(
instanceId).list();
if (tasks1 != null && tasks1.size() == 1) {
repositoryService.deleteDeployment(tasks1.get(0).getId());
runtimeService.deleteProcessInstance(tasks1.get(0).getProcessInstanceId(),comment);
}
}
}
......
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