From 62f2b98b64f6726ca7cb90cbfa996deaac4ffba9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 02 十一月 2023 14:09:04 +0800
Subject: [PATCH] 1、优化查询，便于模糊查询条件2、界面查询条件调整
---
service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 1148c57..11ba2b0 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
@@ -25,17 +25,17 @@
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.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;
@@ -111,7 +111,7 @@
* 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
-@Java110Cmd(serviceCode = "itemRelease.saveItemRelease")
+@Java110Cmd(serviceCode = " itemRelease.saveItemRelease")
public class SaveItemReleaseCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(SaveItemReleaseCmd.class);
@@ -134,7 +134,7 @@
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Autowired
- private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
+ private IOaWorkflowActivitiInnerServiceSMO oaWorkflowActivitiInnerServiceSMOImpl;
@Override
@@ -221,6 +221,8 @@
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
+
+
//鍚姩浠诲姟
JSONObject flowJson = new JSONObject();
flowJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
@@ -230,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();
@@ -242,7 +244,7 @@
flowJson.put("flowId",oaWorkflowDtos.get(0).getFlowId());
- oaWorkflowUserInnerServiceSMOImpl.autoFinishFirstTask(flowJson);
+ oaWorkflowActivitiInnerServiceSMOImpl.autoFinishFirstTask(flowJson);
cmdDataFlowContext.setResponseEntity(ResultVo.success());
--
Gitblit v1.8.0