From 56914af7ef42b124b81216439687446db37fddab Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 31 十月 2024 03:09:08 +0800
Subject: [PATCH] 优化代码
---
service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkTaskCmd.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 b429d96..0adb1af 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
@@ -175,6 +175,10 @@
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();
@@ -189,10 +193,14 @@
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());
+ }
workEventV1InnerServiceSMOImpl.saveWorkEvent(workEventPo);
// todo 鏌ヨ 浠诲姟鏄庣粏鏄惁澶勭悊瀹屾垚
- WorkTaskItemDto workTaskItemDto = new WorkTaskItemDto();
+ workTaskItemDto = new WorkTaskItemDto();
workTaskItemDto.setTaskId(workTaskDto.getTaskId());
workTaskItemDto.setCommunityId(workTaskDto.getCommunityId());
workTaskItemDto.setState(WorkTaskDto.STATE_WAIT);
@@ -217,7 +225,7 @@
WorkTaskDto tmpWorkTaskDto = new WorkTaskDto();
tmpWorkTaskDto.setWorkId(workTaskDto.getWorkId());
tmpWorkTaskDto.setStoreId(workTaskDto.getStoreId());
- tmpWorkTaskDto.setStates(new String[]{WorkTaskDto.STATE_WAIT,WorkTaskDto.STATE_DOING});
+ tmpWorkTaskDto.setStates(new String[]{WorkTaskDto.STATE_WAIT, WorkTaskDto.STATE_DOING});
int waitCount = workTaskV1InnerServiceSMOImpl.queryWorkTasksCount(tmpWorkTaskDto);
WorkPoolPo workPoolPo = new WorkPoolPo();
workPoolPo.setWorkId(workTaskDto.getWorkId());
@@ -269,6 +277,7 @@
workEventPo.setStoreId(workTaskDto.getStoreId());
workEventPo.setTaskId(workTaskDto.getTaskId());
workEventPo.setItemId("-1");
+ workEventPo.setContentId("-1");
workEventV1InnerServiceSMOImpl.saveWorkEvent(workEventPo);
}
}
--
Gitblit v1.8.0