From f0513964b6fa9bc34f629ec0866af1fa4d7cb22e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 23 四月 2023 17:20:17 +0800
Subject: [PATCH] add product category functiong
---
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 519f476..9a3dbb8 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
@@ -96,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);
@@ -141,12 +147,12 @@
if (workflowDataFileDtos == null || workflowDataFileDtos.size() < 1) {
return;
}
- String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"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);
}
/**
@@ -393,9 +399,6 @@
}
-
-
-
return ResultVo.success();
}
@@ -438,7 +441,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"));
@@ -481,7 +484,7 @@
}
//杈撳叆formData
- refreshFormData(oaWorkflowFormDto,datas,paramIn);
+ refreshFormData(oaWorkflowFormDto, datas, paramIn);
long duration = 0L;
for (JSONObject data : datas) {
@@ -520,8 +523,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