绩效考核 还没做完

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/controller/ItdmRunFlowPathController.java

@@ -23,6 +23,7 @@ import org.jeecg.modules.flowpath.service.IItdmFlowPathService;
 import org.jeecg.modules.flowpath.service.IItdmFlowPathStepService;
 import org.jeecg.modules.flowpath.service.IItdmRunFlowPathService;
 import org.jeecg.modules.flowpath.service.IItdmRunFlowPathStepService;
+import org.jeecg.modules.flowpath.vo.ItdmRunFlowPathInfoVO;
 import org.jeecg.modules.flowpath.vo.ItdmRunFlowPathStepVO;
 import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -155,14 +156,14 @@ public class ItdmRunFlowPathController extends JeecgController<ItdmRunFlowPath,
     //@AutoLog(value = "运行流程表-通过id查询")
     @ApiOperation(value = "运行流程表-通过id查询", notes = "运行流程表-通过id查询")
     @GetMapping(value = "/queryById")
-    public Result<ItdmRunFlowPath> queryById(@RequestParam(name = "id", required = true) String id) {
+    public Result<ItdmRunFlowPathInfoVO> queryById(@RequestParam(name = "id", required = true) String id) {
         ItdmRunFlowPath itdmRunFlowPath = itdmRunFlowPathService.getById(id);
         if (itdmRunFlowPath == null) {
             return Result.error("未找到对应数据");
         }
 
         List<ItdmRunFlowPathStep> list = itdmRunFlowPathStepService.
-                list(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class).eq(ItdmRunFlowPathStep::getFlowPath, id));
+                list(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class).eq(ItdmRunFlowPathStep::getRunFlowPath, id));
 
 
         List<ItdmRunFlowPathStepVO> vos = new ArrayList<>();
@@ -180,8 +181,7 @@ public class ItdmRunFlowPathController extends JeecgController<ItdmRunFlowPath,
 
         }
 
-
-        return Result.OK(itdmRunFlowPath);
+        return Result.OK(new ItdmRunFlowPathInfoVO(itdmRunFlowPath, vos));
     }
 
     /**

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/vo/ItdmRunFlowPathInfoVO.java

@@ -0,0 +1,23 @@
+package org.jeecg.modules.flowpath.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.jeecg.modules.flowpath.entity.ItdmRunFlowPath;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ItdmRunFlowPathInfoVO {
+
+
+
+    private ItdmRunFlowPath flowpahData;
+
+    private List<ItdmRunFlowPathStepVO> stepList;
+}