From be1b426b7d765a546f4a26b60e80aa49a57079b9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 13 一月 2024 16:25:11 +0800
Subject: [PATCH] 1、优化采购模块数量不能为小数点问题2、新增客服巡查巡楼记录功能模块3、新增页面导出功能4、优化记录查询条件新增时间段查询条件5、其他界面性调整
---
service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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..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
@@ -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;
@@ -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