Merge remote-tracking branch 'origin/main'

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProgressController.java

@@ -103,17 +103,6 @@ public class OaProgressController extends BaseController {
         ExcelUtil.exportExcel(list, "进度管理", OaProgressVo.class, response);
     }
 
-    /**
-     * 获取进度管理详细信息
-     *
-     * @param progressId 主键
-     */
-    @GetMapping("/{progressId}")
-    public R<OaProgressVo> getInfo(@NotNull(message = "主键不能为空")
-                                   @PathVariable Long progressId) {
-        return R.ok(iOaProgressService.queryById(progressId));
-    }
-
     /**
      * 新增进度管理
      */
@@ -151,4 +140,19 @@ public class OaProgressController extends BaseController {
     public R<List<OaProgressDetail>> getKeyList() {
         return R.ok(iOaProgressService.getKeyList());
     }
+
+
+
+    /**
+     * 获取进度管理详细信息
+     *
+     * @param projectId 主键
+     */
+    @GetMapping("/{projectId}")
+    public R<List<OaProgressVo>> getInfo(@NotNull(message = "主键不能为空")
+                                   @PathVariable("projectId") Long projectId) {
+        List<OaProgressVo> progressVos = iOaProgressService.queryByProjectId(projectId);
+        return R.ok(progressVos);
+    }
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java

@@ -140,4 +140,16 @@ public class SysOaProjectController extends BaseController {
     public TableDataInfo<SysOaProjectVo> files(SysOaWarehouseDetailBo bo, PageQuery pageQuery) {
         return iSysOaProjectService.queryFiles(bo, pageQuery);
     }
+
+
+    /**
+     * 查询进度管理列表
+     */
+    @GetMapping("/progress-list")
+    public TableDataInfo<SysOaProjectVo> progressList(SysOaProjectBo bo, PageQuery pageQuery) {
+        bo.setTradeType(1L);
+        return iSysOaProjectService.listProjects(bo, pageQuery);
+    }
+
+
 }