From 5fc2fc57afc63a906ec5567e91aeab72d20aab7d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 16 一月 2023 23:17:50 +0800
Subject: [PATCH] 优化代码

---
 service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java b/service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java
index 84b6a7a..679baab 100644
--- a/service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java
@@ -24,13 +24,14 @@
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.doc.annotation.*;
+import com.java110.dto.itemRelease.ItemReleaseDto;
 import com.java110.dto.itemReleaseType.ItemReleaseTypeDto;
 import com.java110.dto.oaWorkflow.OaWorkflowDto;
 import com.java110.dto.user.UserDto;
 import com.java110.intf.common.IItemReleaseResV1InnerServiceSMO;
 import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
 import com.java110.intf.common.IItemReleaseV1InnerServiceSMO;
-import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO;
+import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
 import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.po.itemRelease.ItemReleasePo;
@@ -133,7 +134,7 @@
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
     @Autowired
-    private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
+    private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
 
 
     @Override
@@ -191,6 +192,8 @@
 
         ItemReleasePo itemReleasePo = BeanConvertUtil.covertBean(reqJson, ItemReleasePo.class);
         itemReleasePo.setIrId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        itemReleasePo.setState(ItemReleaseDto.STATE_WAIT);
+        itemReleasePo.setCreateUserId(userId);
         int flag = itemReleaseV1InnerServiceSMOImpl.saveItemRelease(itemReleasePo);
 
         if (flag < 1) {
@@ -235,6 +238,10 @@
         flowJson.put("createUserId",userId);
         flowJson.put("nextUserId",reqJson.getJSONObject("audit").getString("staffId"));
         flowJson.put("storeId",itemReleaseTypeDtos.get(0).getStoreId());
+        flowJson.put("id",itemReleasePo.getIrId());
+        flowJson.put("flowId",oaWorkflowDtos.get(0).getFlowId());
+
+
         oaWorkflowUserInnerServiceSMOImpl.autoFinishFirstTask(flowJson);
 
 

--
Gitblit v1.8.0