From 9daeb7b3d3b20a78775bd175746c052682e84f9c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 31 十月 2024 03:41:42 +0800
Subject: [PATCH] 优化代码
---
service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkTaskCmd.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkTaskCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkTaskCmd.java
index 0adb1af..eb8e527 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkTaskCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkTaskCmd.java
@@ -86,12 +86,20 @@
workTaskDto.setStoreId(storeId);
List<WorkTaskDto> workTaskDtos = workTaskV1InnerServiceSMOImpl.queryWorkTasks(workTaskDto);
+ WorkTaskItemDto workTaskItemDto = new WorkTaskItemDto();
+ workTaskItemDto.setItemId(reqJson.getString("itemId"));
+ workTaskItemDto.setCommunityId(workTaskDto.getCommunityId());
+ List<WorkTaskItemDto> workTaskItemDtos = workTaskItemV1InnerServiceSMOImpl.queryWorkTaskItems(workTaskItemDto);
+
+ if (ListUtil.isNull(workTaskItemDtos)) {
+ throw new CmdException("浠诲姟鏄庣粏涓嶅瓨鍦�");
+ }
//todo 杞崟
if ("T".equals(reqJson.getString("auditCode"))) {
doTransfor(reqJson, workTaskDtos.get(0));
} else if ("C".equals(reqJson.getString("auditCode"))) {
- doFinish(reqJson, workTaskDtos.get(0));
+ doFinish(reqJson, workTaskDtos.get(0), workTaskItemDtos.get(0));
}
if (!reqJson.containsKey("pathUrl")) {
@@ -112,6 +120,9 @@
workPoolFilePo.setPathUrl(reqJson.getString("pathUrl"));
workPoolFilePo.setStoreId(workTaskDtos.get(0).getStoreId());
workPoolFilePo.setItemId(reqJson.getString("itemId"));
+
+ workPoolFilePo.setContentId(workTaskItemDtos.get(0).getContentId());
+
workPoolFileV1InnerServiceSMOImpl.saveWorkPoolFile(workPoolFilePo);
}
@@ -122,7 +133,7 @@
* @param reqJson
* @param workTaskDto
*/
- private void doFinish(JSONObject reqJson, WorkTaskDto workTaskDto) {
+ private void doFinish(JSONObject reqJson, WorkTaskDto workTaskDto, WorkTaskItemDto orgWorkTaskItemDto) {
Date endTime = DateUtil.getDateFromStringA(workTaskDto.getEndTime());
@@ -175,10 +186,7 @@
preStaffName = workEventDtos.get(0).getStaffName();
}
- WorkTaskItemDto workTaskItemDto = new WorkTaskItemDto();
- workTaskItemDto.setItemId(reqJson.getString("itemId"));
- workTaskItemDto.setCommunityId(workTaskDto.getCommunityId());
- List<WorkTaskItemDto> workTaskItemDtos = workTaskItemV1InnerServiceSMOImpl.queryWorkTaskItems(workTaskItemDto);
+
//todo 淇濆瓨浜嬩欢
WorkEventPo workEventPo = new WorkEventPo();
@@ -193,14 +201,12 @@
workEventPo.setStoreId(workTaskDto.getStoreId());
workEventPo.setTaskId(workTaskDto.getTaskId());
workEventPo.setItemId(reqJson.getString("itemId"));
- workEventPo.setContentId("-1");
- if (!ListUtil.isNull(workTaskItemDtos)) {
- workEventPo.setContentId(workTaskItemDtos.get(0).getContentId());
- }
+ workEventPo.setContentId(orgWorkTaskItemDto.getContentId());
+
workEventV1InnerServiceSMOImpl.saveWorkEvent(workEventPo);
// todo 鏌ヨ 浠诲姟鏄庣粏鏄惁澶勭悊瀹屾垚
- workTaskItemDto = new WorkTaskItemDto();
+ WorkTaskItemDto workTaskItemDto = new WorkTaskItemDto();
workTaskItemDto.setTaskId(workTaskDto.getTaskId());
workTaskItemDto.setCommunityId(workTaskDto.getCommunityId());
workTaskItemDto.setState(WorkTaskDto.STATE_WAIT);
--
Gitblit v1.8.0