From ae42d2da37fe9d161e7058b51367b95f24c3d97a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 六月 2023 15:11:36 +0800
Subject: [PATCH] optimize
---
service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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..b758846 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.itemReleaseType.ItemReleaseTypeDto;
+import com.java110.dto.itemRelease.ItemReleaseDto;
+import com.java110.dto.itemRelease.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 oaWorkflowActivitiInnerServiceSMOImpl;
@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) {
@@ -218,6 +221,8 @@
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
+
+
//鍚姩浠诲姟
JSONObject flowJson = new JSONObject();
flowJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
@@ -227,7 +232,7 @@
flowJson.put("auditMessage","鎻愪氦瀹℃牳");
flowJson.put("storeId",itemReleaseTypeDtos.get(0).getStoreId());
reqJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
- JSONObject result = oaWorkflowUserInnerServiceSMOImpl.startProcess(flowJson);
+ JSONObject result = oaWorkflowActivitiInnerServiceSMOImpl.startProcess(flowJson);
//鎻愪氦鑰呮彁浜�
flowJson = new JSONObject();
@@ -235,7 +240,11 @@
flowJson.put("createUserId",userId);
flowJson.put("nextUserId",reqJson.getJSONObject("audit").getString("staffId"));
flowJson.put("storeId",itemReleaseTypeDtos.get(0).getStoreId());
- oaWorkflowUserInnerServiceSMOImpl.autoFinishFirstTask(flowJson);
+ flowJson.put("id",itemReleasePo.getIrId());
+ flowJson.put("flowId",oaWorkflowDtos.get(0).getFlowId());
+
+
+ oaWorkflowActivitiInnerServiceSMOImpl.autoFinishFirstTask(flowJson);
cmdDataFlowContext.setResponseEntity(ResultVo.success());
--
Gitblit v1.8.0