工作流新添方法

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/FlowFormController.java

@@ -216,11 +216,6 @@ public class FlowFormController {
             List<Map<String, Object>> nodeInfos = orderedTaskElements.stream()
                     .filter(element -> element != null && isTaskElement(element))
                     .map(element -> {
-
-                        UserTask userTask = (UserTask) element;
-
-
-
                         Map<String, Object> nodeInfo = new HashMap<>();
                         nodeInfo.put("id", element.getId());
                         nodeInfo.put("deployId", deployId);
@@ -228,9 +223,11 @@ public class FlowFormController {
                         nodeInfo.put("type", element.getClass().getSimpleName());
                         nodeInfo.put("attributes", element.getAttributes());
                         nodeInfo.put("procDefId",processDefinition.getId());
-
-
                         if(element instanceof UserTask){
+                            UserTask userTask = (UserTask) element;
+                            Map<String,String> extProperMap = getUserTaskExtensionProperties(userTask);
+                            String isApprove = extProperMap.get("isApprove");
+                            nodeInfo.put("isApprove",isApprove);
                             String formKey =  ((UserTask) element).getFormKey();
                             nodeInfo.put("assignee", userTask.getAssignee());
                             if (formKey != null) {
@@ -241,7 +238,7 @@ public class FlowFormController {
                                         nodeInfo.put("formId", flowForm.getFormId());
                                         nodeInfo.put("formUrl", flowForm.getFormUrl());
                                         nodeInfo.put("formListUrl",flowForm.getFormListurl());
-
+                                        nodeInfo.put("formName",flowForm.getFormName());
                                     }
                                 } catch (NumberFormatException e) {
                                     // 已经在前面处理过，这里可以忽略
@@ -352,4 +349,43 @@ public class FlowFormController {
         }
     }
 
+    public HashMap<String, String> getUserTaskExtensionProperties(UserTask userTask) {
+        HashMap<String, String> extensionProperties = new HashMap<>();
+
+        if (userTask == null) {
+            return extensionProperties;
+        }
+
+        // 获取扩展元素
+        Map<String, List<ExtensionElement>> extensionElements = userTask.getExtensionElements();
+
+        if (extensionElements == null) {
+            return extensionProperties;
+        }
+
+        // 查找名为"properties"的扩展元素
+        List<ExtensionElement> properties = extensionElements.get("properties");
+        if (properties != null) {
+            for (ExtensionElement propertyElement : properties) {
+                // 获取"property"子元素
+                Map<String, List<ExtensionElement>> childElements = propertyElement.getChildElements();
+                List<ExtensionElement> propertyList = childElements.get("property");
+
+                if (propertyList != null) {
+                    for (ExtensionElement prop : propertyList) {
+                        // 读取属性名和值
+                        String name = prop.getAttributeValue(null, "name");
+                        String value = prop.getAttributeValue(null, "value");
+
+                        if (name != null && !name.isEmpty()) {
+                            extensionProperties.put(name, value);
+                        }
+                    }
+                }
+            }
+        }
+
+        return extensionProperties;
+    }
+
 }

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskFormServiceImpl.java

@@ -234,4 +234,5 @@ public class FlowTaskFormServiceImpl extends FlowServiceFactory implements IFlow
         }
     }
 
+
 }
\ No newline at end of file

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/problem/controller/StProblemCheckController.java

@@ -94,13 +94,13 @@ public class StProblemCheckController extends JeecgController<StProblemCheck, IS
 	  
 	//@RequiresPermissions("problem:st_problem_check:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody StProblemCheck stProblemCheck) {
+	public Result<StProblemCheck> add(@RequestBody StProblemCheck stProblemCheck) {
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String userid=sysUser.getId();
 		String username=sysUser.getUsername();
 		stProblemCheck.setCreatedUser(username);
 		stProblemCheckService.save(stProblemCheck);
-		return Result.OK("添加成功！");
+		return Result.OK(stProblemCheck);
 	}
 
 	/**
@@ -113,13 +113,13 @@ public class StProblemCheckController extends JeecgController<StProblemCheck, IS
 	  
 	//@RequiresPermissions("problem:st_problem_check:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody StProblemCheck stProblemCheck) {
+	public Result<StProblemCheck> edit(@RequestBody StProblemCheck stProblemCheck) {
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String userid=sysUser.getId();
 		String username=sysUser.getUsername();
 		stProblemCheck.setUpdatedUser(username);
 		stProblemCheckService.updateById(stProblemCheck);
-		return Result.OK("编辑成功!");
+		return Result.OK(stProblemCheck);
 	}
 	
 	/**