m

youxiw2000
1 parent 9cc68df3
Showing 2 changed files with 21 additions and 1 deletions
trash-workFlow/src/main/java/com/trash/office/listener/leaveEndListener.java
trash-workFlow/src/main/java/com/trash/office/service/impl/LeaveApplicationServiceImpl.java
 package com.trash.office.listener;
  
+import com.trash.business.mapper.SupervisionThreestepMapper;
 import com.trash.common.utils.spring.SpringUtils;
 import com.trash.office.domain.Conference;
 import com.trash.office.domain.LeaveApplication;
@@ -7,6 +8,9 @@ import com.trash.office.domain.UploadFile;
 import com.trash.office.mapper.ConferenceMapper;
 import com.trash.office.mapper.LeaveApplicationMapper;
 import com.trash.office.mapper.UploadFileMapper;
+import com.trash.workflow.domain.Workflow;
+import com.trash.workflow.mapper.WorkflowMapper;
+
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.Expression;
@@ -58,5 +62,22 @@ public class leaveEndListener implements ExecutionListener {
                 uploadFileMapper.updateUploadFile(uploadFile1);
             }
         }
+            	
+        WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);
+        
+    	Workflow workflow = new Workflow();
+    	
+    	workflow.setId(delegateExecution.getProcessInstanceBusinessKey());
+    	
+    	workflow.setState(state.getValue(delegateExecution).toString());
+    	
+    	workflowMapper.updateWorkflow(workflow);
+    	
+    	workflow = workflowMapper.selectWorkflowById(workflow.getId());
+    	
+    	workflowMapper.insertWorkflowHistory(workflow);
+    	
+    	workflowMapper.deleteWorkflowById(delegateExecution.getProcessInstanceBusinessKey());
+        
     }
 }
@@ -213,7 +213,6 @@ public class LeaveApplicationServiceImpl implements ILeaveApplicationService
                 roleId = 0;
             }
         }
-        roleId = 0;
         String numberDays = leaveApplication.getNumberDays();
         //新增工作台数据
         Workflow workflow = new Workflow();