优化员工

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

@@ -52,6 +52,7 @@ public class PurchaseApplyDto extends PageDto implements Serializable {
     private String auditMessage;
     private String staffId;
     private String staffName;
+    private String nextStaffId;
     private String staffTel;
     private String startUserId;
     private String warehousingWay;
@@ -369,4 +370,12 @@ public class PurchaseApplyDto extends PageDto implements Serializable {
     public void setAssigneeUser(String assigneeUser) {
         this.assigneeUser = assigneeUser;
     }
+
+    public String getNextStaffId() {
+        return nextStaffId;
+    }
+
+    public void setNextStaffId(String nextStaffId) {
+        this.nextStaffId = nextStaffId;
+    }
 }

service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java

@@ -78,9 +78,11 @@ public class PurchaseApplyUserInnerServiceSMOImpl extends BaseServiceSMO impleme
         //将信息加入map,以便传入流程中
         Map<String, Object> variables = new HashMap<String, Object>();
         variables.put("purchaseApplyDto", purchaseApplyDto);
-        variables.put("nextAuditStaffId", purchaseApplyDto.getStaffId());
+        variables.put("nextAuditStaffId", purchaseApplyDto.getNextStaffId());
         variables.put("userId", purchaseApplyDto.getCurrentUserId());
         variables.put("startUserId", purchaseApplyDto.getCurrentUserId());
+        variables.put("nextUserId", purchaseApplyDto.getNextStaffId());
+
         //开启流程
         ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(purchaseApplyDto.getStoreId()), purchaseApplyDto.getApplyOrderId(), variables);
         //获取申请id

service-store/src/main/java/com/java110/store/api/PurchaseApi.java

@@ -101,7 +101,7 @@ public class PurchaseApi {
             purchaseApplyDetailPos.add(purchaseApplyDetailPo);
         }
         purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
-        return purchaseApplyBMOImpl.apply(purchaseApplyPo);
+        return purchaseApplyBMOImpl.apply(purchaseApplyPo,reqJson);
     }
 
     @RequestMapping(value = "/resourceEnter", method = RequestMethod.POST)
@@ -200,7 +200,7 @@ public class PurchaseApi {
             resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);
         }
         purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
-        return purchaseApplyBMOImpl.apply(purchaseApplyPo);
+        return purchaseApplyBMOImpl.apply(purchaseApplyPo,reqJson);
     }
 
     /**
@@ -404,6 +404,6 @@ public class PurchaseApi {
             }
         }
         purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
-        return purchaseApplyBMOImpl.apply(purchaseApplyPo);
+        return purchaseApplyBMOImpl.apply(purchaseApplyPo,reqJson);
     }
 }

service-store/src/main/java/com/java110/store/bmo/purchase/IPurchaseApplyBMO.java

@@ -1,5 +1,6 @@
 package com.java110.store.bmo.purchase;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.po.purchase.PurchaseApplyPo;
 import org.springframework.http.ResponseEntity;
 
@@ -10,5 +11,5 @@ public interface IPurchaseApplyBMO {
      * @param purchaseApplyPo
      * @return
      */
-    ResponseEntity<String> apply(PurchaseApplyPo purchaseApplyPo);
+    ResponseEntity<String> apply(PurchaseApplyPo purchaseApplyPo, JSONObject reqJson);
 }

service-store/src/main/java/com/java110/store/bmo/purchase/impl/PurchaseApplyBMOImpl.java

@@ -1,5 +1,6 @@
 package com.java110.store.bmo.purchase.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.dto.purchaseApply.PurchaseApplyDto;
 import com.java110.intf.common.IPurchaseApplyUserInnerServiceSMO;
@@ -23,7 +24,7 @@ public class PurchaseApplyBMOImpl implements IPurchaseApplyBMO {
 
     @Override
     @Java110Transactional
-    public ResponseEntity<String> apply(PurchaseApplyPo purchaseApplyPo) {
+    public ResponseEntity<String> apply(PurchaseApplyPo purchaseApplyPo, JSONObject reqJson) {
         int saveFlag = purchaseApplyInnerServiceSMOImpl.savePurchaseApply(purchaseApplyPo);
         if (saveFlag < 1) {
             return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "采购申请失败");
@@ -31,6 +32,7 @@ public class PurchaseApplyBMOImpl implements IPurchaseApplyBMO {
         PurchaseApplyDto purchaseApplyDto = BeanConvertUtil.covertBean(purchaseApplyPo, PurchaseApplyDto.class);
         purchaseApplyDto.setCurrentUserId(purchaseApplyPo.getUserId());
         if(!purchaseApplyPo.getWarehousingWay().equals(PurchaseApplyDto.WAREHOUSING_TYPE_DIRECT) && !purchaseApplyPo.getWarehousingWay().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT)){
+            purchaseApplyDto.setNextStaffId(reqJson.getString("staffId"));
             purchaseApplyUserInnerServiceSMOImpl.startProcess(purchaseApplyDto);
         }
         return ResultVo.createResponseEntity(ResultVo.CODE_OK, "采购申请成功");