优化采购ç”申请代码

Api/src/main/java/com/java110/api/listener/purchaseApply/SavePurchaseApplyListener.java

@@ -56,11 +56,11 @@ public class SavePurchaseApplyListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = purchaseApplyBMOImpl.callService(context, service.getServiceCode(), businesses);
 
         //开始流程
-//        if(HttpStatus.OK == responseEntity.getStatusCode()){
-//            PurchaseApplyDto purchaseApplyDto = BeanConvertUtil.covertBean(reqJson, PurchaseApplyDto.class);
-//            purchaseApplyDto.setCurrentUserId(reqJson.getString("userId"));
-//            iPurchaseApplyUserInnerServiceSMO.startProcess(purchaseApplyDto);
-//        }
+        if(HttpStatus.OK == responseEntity.getStatusCode()){
+            PurchaseApplyDto purchaseApplyDto = BeanConvertUtil.covertBean(reqJson, PurchaseApplyDto.class);
+            purchaseApplyDto.setCurrentUserId(reqJson.getString("userId"));
+            iPurchaseApplyUserInnerServiceSMO.startProcess(purchaseApplyDto);
+        }
         context.setResponseEntity(responseEntity);
     }
 

CommonService/src/main/java/com/java110/common/activity/resourceEnter/ResourceEnterToBuyerListener.java

@@ -6,7 +6,9 @@ import com.java110.dto.resourceStore.ResourceOrderDto;
 import com.java110.entity.audit.AuditUser;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.util.BeanConvertUtil;
+import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.TaskListener;
 
 import java.util.List;
@@ -14,7 +16,7 @@ import java.util.List;
 /**
  * 采购人员采购
  */
-public class ResourceEnterToBuyerListener implements TaskListener {
+public class ResourceEnterToBuyerListener implements TaskListener , ExecutionListener {
 
     private IAuditUserInnerServiceSMO auditUserInnerServiceSMOImpl;
 
@@ -36,4 +38,9 @@ public class ResourceEnterToBuyerListener implements TaskListener {
 
         }
     }
+
+    @Override
+    public void notify(DelegateExecution execution) {
+
+    }
 }

CommonService/src/main/java/com/java110/common/activity/resourceEnter/ResourceEnterToDepartmentListener.java

@@ -6,7 +6,9 @@ import com.java110.dto.resourceStore.ResourceOrderDto;
 import com.java110.entity.audit.AuditUser;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.util.BeanConvertUtil;
+import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.TaskListener;
 
 import java.util.List;
@@ -14,7 +16,7 @@ import java.util.List;
 /**
  * 部门领导 监听类
  */
-public class ResourceEnterToDepartmentListener implements TaskListener {
+public class ResourceEnterToDepartmentListener implements TaskListener , ExecutionListener {
 
     private IAuditUserInnerServiceSMO auditUserInnerServiceSMOImpl;
 
@@ -31,9 +33,15 @@ public class ResourceEnterToDepartmentListener implements TaskListener {
 
         for (AuditUserDto tmpAuditUser : auditUserDtos) {
             AuditUser auditUser = BeanConvertUtil.covertBean(tmpAuditUser, AuditUser.class);
+            System.err.println("审核人id："+tmpAuditUser.getUserName()+tmpAuditUser.getUserId());
 
             delegateTask.setVariable(auditUser.getUserId(), auditUser);
 
         }
     }
+
+    @Override
+    public void notify(DelegateExecution execution) {
+
+    }
 }

CommonService/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java

@@ -78,6 +78,7 @@ public class PurchaseApplyUserInnerServiceSMOImpl extends BaseServiceSMO impleme
         Task task = null;
         TaskQuery query = taskService.createTaskQuery().taskCandidateOrAssigned(purchaseApplyDto.getCurrentUserId()).active();
         List<Task> todoList = query.list();//获取申请人的待办任务列表
+        List<Task> list = taskService.createTaskQuery().list();
         for (Task tmp : todoList) {
             if (tmp.getProcessInstanceId().equals(purchaseApplyDto.getProcessInstanceId())) {
                 task = tmp;//获取当前流程实例，当前申请人的待办任务

CommonService/src/main/resources/processes/resourceEnter.bpmn

@@ -4,7 +4,7 @@
     <startEvent id="_2" name="StartEvent"/>
     <userTask activiti:exclusive="true" id="_3" name="department">
       <extensionElements>
-        <activiti:executionListener class="com.java110.common.activity.resourceEnter.ResourceEnterToDepartmentListener" event="start"/>
+        <activiti:executionListener class="com.java110.common.activity.resourceEnter.ResourceEnterToDepartmentListener" event="department"/>
       </extensionElements>
     </userTask>
     <userTask activiti:exclusive="true" id="_4" name="finance"/>