优化 提交采购是提交给下一任审核人员

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

@@ -28,10 +28,11 @@ public class ResourceEnterToDepartmentListener implements TaskListener , Executi
     public void notify(DelegateTask delegateTask) {
         logger.info("查询部门审核人员");
 
-        auditUserInnerServiceSMOImpl = ApplicationContextFactory.getBean("auditUserInnerServiceSMOImpl", IAuditUserInnerServiceSMO.class);
-        AuditUserDto auditUserDto = new AuditUserDto();
-        PurchaseApplyDto purchaseApplyDto = (PurchaseApplyDto)delegateTask.getVariable("purchaseApplyDto");
-        auditUserDto.setStoreId(purchaseApplyDto.getStoreId());
+//        auditUserInnerServiceSMOImpl = ApplicationContextFactory.getBean("auditUserInnerServiceSMOImpl", IAuditUserInnerServiceSMO.class);
+//        AuditUserDto auditUserDto = new AuditUserDto();
+//        PurchaseApplyDto purchaseApplyDto = (PurchaseApplyDto)delegateTask.getVariable("purchaseApplyDto");
+        String nextAuditStaffId = delegateTask.getVariable("nextAuditStaffId").toString();
+        /*auditUserDto.setStoreId(purchaseApplyDto.getStoreId());
         auditUserDto.setObjCode("resourceEntry");
         auditUserDto.setAuditLink("809001");
         List<AuditUserDto> auditUserDtos = auditUserInnerServiceSMOImpl.queryAuditUsers(auditUserDto);
@@ -49,10 +50,10 @@ public class ResourceEnterToDepartmentListener implements TaskListener , Executi
 
         if (auditUserDtos == null || auditUserDtos.size() < 1) {
             return;
-        }
+        }*/
 
-        delegateTask.setAssignee(auditUserDtos.get(0).getUserId());
-        logger.info("设置部门审核人员："+auditUserDtos.get(0).getUserId()+auditUserDtos.get(0).getUserName());
+        delegateTask.setAssignee(nextAuditStaffId);
+        logger.info("设置部门审核人员："+nextAuditStaffId);
     }
 
 

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

@@ -67,11 +67,11 @@ public class PurchaseApplyUserInnerServiceSMOImpl extends BaseServiceSMO impleme
         //开启流程
         ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("resourceEntry", purchaseApplyDto.getApplyOrderId(), variables);
 //        //将得到的实例流程id值赋给之前设置的变量
-//        String processInstanceId = processInstance.getId();
+        String processInstanceId = processInstance.getId();
 //        // System.out.println("流程开启成功.......实例流程id:" + processInstanceId);
 //
-//        purchaseApplyDto.setProcessInstanceId(processInstanceId);
-//        autoFinishFirstTask(purchaseApplyDto);
+        purchaseApplyDto.setProcessInstanceId(processInstanceId);
+        autoFinishFirstTask(purchaseApplyDto);
         return purchaseApplyDto;
     }
 
@@ -84,7 +84,7 @@ public class PurchaseApplyUserInnerServiceSMOImpl extends BaseServiceSMO impleme
         auditUserDto.setObjCode("resourceEntry");
         auditUserDto.setAuditLink("809001");
         List<AuditUserDto> auditUserDtos = auditUserInnerServiceSMOImpl.queryAuditUsers(auditUserDto);
-        if(auditUserDtos.size() == 0 || auditUserDtos == null){
+        if (auditUserDtos.size() == 0 || auditUserDtos == null) {
             throw new IllegalArgumentException("未找的采购部门审核人员信息");
         }
         Task task = null;
@@ -184,9 +184,9 @@ public class PurchaseApplyUserInnerServiceSMOImpl extends BaseServiceSMO impleme
         HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey("resourceEnter")
                 .taskAssignee(user.getUserId());
-        if(!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())){
+        if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
             historicTaskInstanceQuery.taskName("resourceEnter");
-        }else if(!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())){
+        } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
             historicTaskInstanceQuery.taskName("resourceEnterDealUser");
         }
 
@@ -204,10 +204,10 @@ public class PurchaseApplyUserInnerServiceSMOImpl extends BaseServiceSMO impleme
 
         HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey("resourceEnter")
-                .taskAssignee(user.getUserId()) ;
-        if(!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())){
+                .taskAssignee(user.getUserId());
+        if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
             historicTaskInstanceQuery.taskName("resourceEnter");
-        }else if(!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())){
+        } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
             historicTaskInstanceQuery.taskName("resourceEnterDealUser");
         }
 
@@ -249,11 +249,12 @@ public class PurchaseApplyUserInnerServiceSMOImpl extends BaseServiceSMO impleme
         Map<String, Object> variables = new HashMap<String, Object>();
         variables.put("auditCode", purchaseApplyDto.getAuditCode());
         variables.put("currentUserId", purchaseApplyDto.getCurrentUserId());
+        variables.put("nextAuditStaffId",purchaseApplyDto.getStaffId());
         //taskService.setAssignee(complaintDto.getTaskId(),complaintDto.getCurrentUserId());
         //taskService.addCandidateUser(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
         //taskService.claim(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
         taskService.complete(purchaseApplyDto.getTaskId(), variables);
-        taskService.setVariable(purchaseApplyDto.getTaskId(),"purchaseApplyDto",purchaseApplyDto);
+        taskService.setVariable(purchaseApplyDto.getTaskId(), "purchaseApplyDto", purchaseApplyDto);
 
         ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
         if (pi == null) {
@@ -284,8 +285,6 @@ public class PurchaseApplyUserInnerServiceSMOImpl extends BaseServiceSMO impleme
     }
 
 
-
-
     public ProcessEngine getProcessEngine() {
         return processEngine;
     }

java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java

@@ -39,6 +39,8 @@ public class PurchaseApplyDto extends PageDto implements Serializable {
     private String taskId;
     private String auditCode;
     private String auditMessage;
+    private String staffId;
+    private String staffName;
 
 
 
@@ -196,4 +198,20 @@ public class PurchaseApplyDto extends PageDto implements Serializable {
     public void setEndUserTel(String endUserTel) {
         this.endUserTel = endUserTel;
     }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
 }