This commit is contained in:
2026-09-25 15:21:22 +08:00
parent 5f036ebe6a
commit feb0ce8ee2
2 changed files with 9 additions and 14 deletions
@@ -10,7 +10,6 @@ import org.springblade.core.tool.utils.StringUtil;
import org.springblade.process.feign.IBusinessProcessClient; import org.springblade.process.feign.IBusinessProcessClient;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -129,14 +128,12 @@ public class MkProcessMessageService {
if (!"20".equals(firstText(info, "fdProcessStatus"))) { if (!"20".equals(firstText(info, "fdProcessStatus"))) {
return false; return false;
} }
if (hasItems(info.get("currentHandlers"))) { Object historyHandlerInfos = asMap(info.get("fdTaskInfo")).get("historyHandlerInfos");
if (!(historyHandlerInfos instanceof List<?> historyList) || historyList.isEmpty()) {
return false; return false;
} }
return !hasItems(asMap(info.get("fdTaskInfo")).get("handlerInfos")); Object lastHandler = historyList.get(historyList.size() - 1);
} return "N6".equals(firstText(asMap(lastHandler), "nodeNumber"));
private static boolean hasItems(Object value) {
return value instanceof Collection<?> collection && !collection.isEmpty();
} }
private void applyProcessResult(IMkProcessBizHandler handler, String bizType, String bizIdText, private void applyProcessResult(IMkProcessBizHandler handler, String bizType, String bizIdText,
@@ -15,9 +15,9 @@ import org.springblade.process.feign.IBusinessProcessClient;
import org.springblade.transport.service.ICustomerArchiveService; import org.springblade.transport.service.ICustomerArchiveService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
@@ -120,14 +120,12 @@ public class CustomerArchivePublicProcessService {
if (!"20".equals(firstText(info, "fdProcessStatus"))) { if (!"20".equals(firstText(info, "fdProcessStatus"))) {
return false; return false;
} }
if (hasItems(info.get("currentHandlers"))) { Object historyHandlerInfos = asMap(info.get("fdTaskInfo")).get("historyHandlerInfos");
if (!(historyHandlerInfos instanceof List<?> historyList) || historyList.isEmpty()) {
return false; return false;
} }
return !hasItems(asMap(info.get("fdTaskInfo")).get("handlerInfos")); Object lastHandler = historyList.get(historyList.size() - 1);
} return "N6".equals(firstText(asMap(lastHandler), "nodeNumber"));
private static boolean hasItems(Object value) {
return value instanceof Collection<?> collection && !collection.isEmpty();
} }
private void applyProcessResult(String customerIdText, String processId, Map<String, Object> formValues, private void applyProcessResult(String customerIdText, String processId, Map<String, Object> formValues,