From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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 a505cbc..9cdc971 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,17 +24,18 @@
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;
-import com.java110.po.itemReleaseRes.ItemReleaseResPo;
+import com.java110.po.itemRelease.ItemReleaseResPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -133,7 +134,7 @@
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Autowired
- private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
+ private IOaWorkflowActivitiInnerServiceSMO oaWorkflowActivitiInnerServiceSMOImpl;
@Override
@@ -161,7 +162,6 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
ItemReleaseTypeDto itemReleaseTypeDto = new ItemReleaseTypeDto();
@@ -171,7 +171,7 @@
Assert.listOnlyOne(itemReleaseTypeDtos,"鏈寘鍚斁琛岀被鍨�");
OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
- oaWorkflowDto.setStoreId(storeId);
+ oaWorkflowDto.setStoreId(itemReleaseTypeDtos.get(0).getStoreId());
oaWorkflowDto.setFlowId(itemReleaseTypeDtos.get(0).getFlowId());
List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
Assert.listOnlyOne(oaWorkflowDtos, "娴佺▼涓嶅瓨鍦�");
@@ -192,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) {
@@ -219,6 +221,8 @@
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
+
+
//鍚姩浠诲姟
JSONObject flowJson = new JSONObject();
flowJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
@@ -226,16 +230,21 @@
flowJson.put("flowId",oaWorkflowDtos.get(0).getFlowId());
flowJson.put("id",itemReleasePo.getIrId());
flowJson.put("auditMessage","鎻愪氦瀹℃牳");
- flowJson.put("storeId",storeId);
+ 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();
flowJson.put("processInstanceId",result.getString("processInstanceId"));
flowJson.put("createUserId",userId);
flowJson.put("nextUserId",reqJson.getJSONObject("audit").getString("staffId"));
- oaWorkflowUserInnerServiceSMOImpl.autoFinishFirstTask(flowJson);
+ flowJson.put("storeId",itemReleaseTypeDtos.get(0).getStoreId());
+ flowJson.put("id",itemReleasePo.getIrId());
+ flowJson.put("flowId",oaWorkflowDtos.get(0).getFlowId());
+
+
+ oaWorkflowActivitiInnerServiceSMOImpl.autoFinishFirstTask(flowJson);
cmdDataFlowContext.setResponseEntity(ResultVo.success());
--
Gitblit v1.8.0