|
|
@@ -11,10 +11,7 @@ import org.springframework.context.annotation.Primary;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Optional;
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Primary
|
|
|
@Service
|
|
|
@@ -41,13 +38,14 @@ public class McTbEventImpl implements TBEvent {
|
|
|
// if(!Arrays.asList("622ee3450cf3bb5e1a486f1f","61a9e8a36355609fb6383d40").contains(creatorId)){
|
|
|
// return;
|
|
|
// }
|
|
|
- if(status.equals("finish")){
|
|
|
+ if(status.equals("finish")||status.equals("begin")){
|
|
|
+ boolean isBegin = status.equals("begin");
|
|
|
List<Map> list=tbClient.queryNodeList(taskId);
|
|
|
Map node = _getNodeDetail(list,nodeId);
|
|
|
if(String.valueOf(node.get("name")).contains("接单")){
|
|
|
- List<String> assigneeIds = UtilMap.getList(node,"assigneeIds");
|
|
|
- String startDate = UtilMap.getString(node,"startDate");
|
|
|
- String dueDate = UtilMap.getString(node,"dueDate");
|
|
|
+ List<String> assigneeIds = isBegin? new ArrayList<>() :UtilMap.getList(node,"assigneeIds");
|
|
|
+ String startDate = isBegin? "null": UtilMap.getString(node,"startDate");
|
|
|
+ String dueDate = isBegin? "null": UtilMap.getString(node,"dueDate");
|
|
|
Map nextMap=_getNextNode(list,nodeId);
|
|
|
if(nextMap!=null){
|
|
|
String nextId = UtilMap.getString(nextMap,"id");
|
lfx