From aa223a550b25e2965974ee5cd3be107f50b998ef Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 18 十一月 2024 20:55:03 +0800
Subject: [PATCH] 优化代码
---
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
index 3509dd9..ddaebb8 100644
--- a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
+++ b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
@@ -4,11 +4,11 @@
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
-import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
-import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDataDto;
+import com.java110.dto.oaWorkflow.OaWorkflowFormDto;
import com.java110.dto.user.UserDto;
-import com.java110.dto.workflowDataFile.WorkflowDataFileDto;
-import com.java110.entity.audit.AuditUser;
+import com.java110.dto.oaWorkflow.WorkflowDataFileDto;
+import com.java110.dto.audit.AuditUser;
import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowDataInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
@@ -16,8 +16,9 @@
import com.java110.intf.oa.IWorkflowDataFileV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.oa.bmo.oaWorkflowForm.IGetOaWorkflowFormBMO;
-import com.java110.po.workflowDataFile.WorkflowDataFilePo;
+import com.java110.po.oaWorkflow.WorkflowDataFilePo;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -95,10 +96,16 @@
*/
@Override
public ResponseEntity<String> queryOaWorkflowFormData(Map paramIn) {
+ OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+ oaWorkflowDto.setFlowId(paramIn.get("flowId").toString());
+ oaWorkflowDto.setStoreId(paramIn.get("storeId").toString());
+ List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+ Assert.listOnlyOne(oaWorkflowDtos, "娴佺▼涓嶅瓨鍦�");
OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
oaWorkflowFormDto.setFlowId(paramIn.get("flowId").toString());
oaWorkflowFormDto.setStoreId(paramIn.get("storeId").toString());
+ oaWorkflowFormDto.setFormId(oaWorkflowDtos.get(0).getCurFormId());
oaWorkflowFormDto.setRow(1);
oaWorkflowFormDto.setPage(1);
List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
@@ -140,12 +147,12 @@
if (workflowDataFileDtos == null || workflowDataFileDtos.size() < 1) {
return;
}
- String imgUrl = MappingCache.getValue("IMG_PATH");
- for(WorkflowDataFileDto tmpWorkflowDataFileDto: workflowDataFileDtos){
+ String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
+ for (WorkflowDataFileDto tmpWorkflowDataFileDto : workflowDataFileDtos) {
tmpWorkflowDataFileDto.setRealFileName(imgUrl + tmpWorkflowDataFileDto.getRealFileName());
}
- datas.get(0).put("files",workflowDataFileDtos);
+ datas.get(0).put("files", workflowDataFileDtos);
}
/**
@@ -155,6 +162,7 @@
* @return
*/
@Override
+ @Java110Transactional
public ResponseEntity<String> saveOaWorkflowFormData(JSONObject reqJson) {
OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
oaWorkflowFormDto.setFlowId(reqJson.get("flowId").toString());
@@ -392,9 +400,6 @@
}
-
-
-
return ResultVo.success();
}
@@ -437,7 +442,7 @@
oaWorkflowFormDto.setPage(1);
List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
//Assert.listOnlyOne(oaWorkflowFormDtos, "鏈寘鍚祦绋嬭〃鍗曪紝璇峰厛璁剧疆琛ㄥ崟");
- OaWorkflowFormDto tmpOaWorkflowFormDto = (oaWorkflowFormDtos == null || oaWorkflowFormDtos.size() < 1)?null:oaWorkflowFormDtos.get(0);
+ OaWorkflowFormDto tmpOaWorkflowFormDto = (oaWorkflowFormDtos == null || oaWorkflowFormDtos.size() < 1) ? null : oaWorkflowFormDtos.get(0);
OaWorkflowDataDto oaWorkflowDataDto = new OaWorkflowDataDto();
oaWorkflowDataDto.setFlowId(paramIn.getString("flowId"));
@@ -480,7 +485,7 @@
}
//杈撳叆formData
- refreshFormData(oaWorkflowFormDto,datas,paramIn);
+ refreshFormData(oaWorkflowFormDto, datas, paramIn);
long duration = 0L;
for (JSONObject data : datas) {
@@ -519,8 +524,8 @@
}
private void refreshFormData(OaWorkflowFormDto oaWorkflowFormDto, List<JSONObject> datas, JSONObject paramIn) {
- if(oaWorkflowFormDto == null){
- return ;
+ if (oaWorkflowFormDto == null) {
+ return;
}
List<String> ids = new ArrayList<>();
--
Gitblit v1.8.0