预设项目进度控制

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

@@ -6,6 +6,7 @@ import java.util.Arrays;
 
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo;
+import com.ruoyi.oa.domain.vo.SysOaFileVo;
 import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo;
 import com.ruoyi.oa.mapper.SysOaTaskMapper;
 import lombok.RequiredArgsConstructor;
@@ -130,9 +131,7 @@ public class SysOaProjectController extends BaseController {
     @DSTransactional
     @DeleteMapping("/{projectIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] projectIds) {
-        Arrays.asList(projectIds).forEach(v ->{
-            sysOaTaskMapper.deleteSysOaTaskByProjectId(v);
-        });
+        Arrays.asList(projectIds).forEach(sysOaTaskMapper::deleteSysOaTaskByProjectId);
         return toAjax(iSysOaProjectService.deleteWithValidByIds(Arrays.asList(projectIds), true));
     }
 
@@ -144,4 +143,10 @@ public class SysOaProjectController extends BaseController {
     public TableDataInfo<SysOaOutWarehouseListVo> outWareList(SysOaWarehouseDetailBo bo, PageQuery pageQuery) {
         return iSysOaProjectService.queryOutWarePageList(bo, pageQuery);
     }
-}
+
+
+    @GetMapping("/files")
+    public TableDataInfo<SysOaProjectVo> files(SysOaWarehouseDetailBo bo, PageQuery pageQuery) {
+        return iSysOaProjectService.queryFiles(bo, pageQuery);
+    }
+}

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

@@ -81,27 +81,6 @@ public class SysOaTaskController extends BaseController {
         return R.ok(iSysOaTaskService.listDocumentProject(projectId));
     }
 
-    /**
-     * 根据工作类型字典查询任务列表
-     * @param pid
-     * @return
-     */
-    @GetMapping("/getTaskByDictType/{pid}")
-    public R taskByDictType(@PathVariable Long pid){
-        R taskByDictList = iSysOaTaskService.queryTaskByDictList(pid);
-        return R.ok("ok", taskByDictList);
-    }
-
-    /**
-     * 根据工作类型查询列表
-     * @param bo
-     * @return
-     */
-    @GetMapping("/listByType")
-    public List<SysOaTaskVo> listByType(SysOaTaskBo bo){
-        return iSysOaTaskService.queryListByType(bo);
-    }
-
     /**
      * 导出任务管理列表
      */