进度控制开发，任务模式bug修正

2025-04-17 16:46:47 +08:00
parent a67cac2ebe
commit e159c3acc0
30 changed files with 1537 additions and 26 deletions
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProgressController.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProgressController.java
@@ -0,0 +1,153 @@
+package com.ruoyi.oa.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import com.ruoyi.oa.domain.OaProgressDetail;
+import com.ruoyi.oa.domain.bo.OaProgressDetailBo;
+import com.ruoyi.oa.domain.bo.SysOaProjectBo;
+import com.ruoyi.oa.domain.vo.OaProgressDetailVo;
+import com.ruoyi.oa.domain.vo.SysOaProjectVo;
+import com.ruoyi.oa.service.IOaProgressDetailService;
+import com.ruoyi.oa.service.ISysOaProjectService;
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.oa.domain.vo.OaProgressVo;
+import com.ruoyi.oa.domain.bo.OaProgressBo;
+import com.ruoyi.oa.service.IOaProgressService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 进度管理
+ *
+ * @author hdka
+ * @date 2025-04-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/oa/progress")
+public class OaProgressController extends BaseController {
+
+    private final IOaProgressService iOaProgressService;
+
+    private final ISysOaProjectService projectService;
+
+    private final IOaProgressDetailService detailService;
+    /**
+     * 查询进度管理列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<OaProgressVo> list(OaProgressBo bo, PageQuery pageQuery) {
+        return iOaProgressService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 查询进度管理列表
+     */
+    @GetMapping("/one-list")
+    public TableDataInfo<SysOaProjectVo> oneList(SysOaProjectBo bo, PageQuery pageQuery) {
+        return projectService.queryPageList2(bo, pageQuery);
+    }
+
+    /**
+     * 查询进度管理列表
+     */
+    @GetMapping("/two-list")
+    public TableDataInfo<OaProgressVo> twoList(OaProgressBo bo,  PageQuery pageQuery) {
+        bo.setParentId(0L);
+        return iOaProgressService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询进度管理列表
+     */
+    @GetMapping("/three-list")
+    public TableDataInfo<OaProgressVo> threeList(OaProgressBo bo,  PageQuery pageQuery) {
+        return iOaProgressService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询进度管理列表
+     */
+    @GetMapping("/four-list")
+    public TableDataInfo<OaProgressDetailVo> fourList(OaProgressDetailBo bo, PageQuery pageQuery) {
+        return detailService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 导出进度管理列表
+     */
+    @Log(title = "进度管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(OaProgressBo bo, HttpServletResponse response) {
+        List<OaProgressVo> list = iOaProgressService.queryList(bo);
+        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));
+    }
+
+    /**
+     * 新增进度管理
+     */
+    @Log(title = "进度管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody OaProgressBo bo) {
+        return toAjax(iOaProgressService.insertByBo(bo));
+    }
+
+    /**
+     * 修改进度管理
+     */
+    @Log(title = "进度管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody OaProgressBo bo) {
+        return toAjax(iOaProgressService.updateByBo(bo));
+    }
+
+    /**
+     * 删除进度管理
+     *
+     * @param progressIds 主键串
+     */
+    @Log(title = "进度管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{progressIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] progressIds) {
+        return toAjax(iOaProgressService.deleteWithValidByIds(Arrays.asList(progressIds), true));
+    }
+
+
+    @GetMapping("/key-list")
+    public R<List<OaProgressDetail>> getKeyList() {
+        return R.ok(iOaProgressService.getKeyList());
+    }
+}
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProgressDetailController.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProgressDetailController.java
@@ -0,0 +1,99 @@
+package com.ruoyi.oa.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.oa.domain.vo.OaProgressDetailVo;
+import com.ruoyi.oa.domain.bo.OaProgressDetailBo;
+import com.ruoyi.oa.service.IOaProgressDetailService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 进度扩展
+ *
+ * @author hdka2
+ * @date 2025-04-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/oa/progressDetail")
+public class OaProgressDetailController extends BaseController {
+
+    private final IOaProgressDetailService iOaProgressDetailService;
+
+    /**
+     * 查询进度扩展列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<OaProgressDetailVo> list(OaProgressDetailBo bo, PageQuery pageQuery) {
+        return iOaProgressDetailService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出进度扩展列表
+     */
+    @Log(title = "进度扩展", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(OaProgressDetailBo bo, HttpServletResponse response) {
+        List<OaProgressDetailVo> list = iOaProgressDetailService.queryList(bo);
+        ExcelUtil.exportExcel(list, "进度扩展", OaProgressDetailVo.class, response);
+    }
+
+    /**
+     * 获取进度扩展详细信息
+     *
+     * @param detailId 主键
+     */
+    @GetMapping("/{detailId}")
+    public R<OaProgressDetailVo> getInfo(@NotNull(message = "主键不能为空")
+                                         @PathVariable Long detailId) {
+        return R.ok(iOaProgressDetailService.queryById(detailId));
+    }
+
+    /**
+     * 新增进度扩展
+     */
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody OaProgressDetailBo bo) {
+        return toAjax(iOaProgressDetailService.insertByBo(bo));
+    }
+
+    /**
+     * 修改进度扩展
+     */
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody OaProgressDetailBo bo) {
+        return toAjax(iOaProgressDetailService.updateByBo(bo));
+    }
+
+    /**
+     * 删除进度扩展
+     *
+     * @param detailIds 主键串
+     */
+    @DeleteMapping("/{detailIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] detailIds) {
+        return toAjax(iOaProgressDetailService.deleteWithValidByIds(Arrays.asList(detailIds), true));
+    }
+}
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java
@@ -48,7 +48,6 @@ public class SysOaProjectController extends BaseController {
    /**
     * 查询项目管理列表
     */
-    @SaCheckPermission("oa:project:list")
    @GetMapping("/list")
    public TableDataInfo<SysOaProjectVo> list(SysOaProjectBo bo, PageQuery pageQuery) {
        return iSysOaProjectService.queryPageList(bo, pageQuery);
@@ -57,7 +56,6 @@ public class SysOaProjectController extends BaseController {
    /**
     * 导出项目管理列表
     */
-    @SaCheckPermission("oa:project:export")
    @Log(title = "项目管理", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(SysOaProjectBo bo, HttpServletResponse response) {
@@ -70,7 +68,6 @@ public class SysOaProjectController extends BaseController {
     *
     * @param projectId 主键
     */
-    @SaCheckPermission("oa:project:query")
    @GetMapping("/{projectId}")
    public R<SysOaProjectVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long projectId) {
@@ -101,7 +98,6 @@ public class SysOaProjectController extends BaseController {
    /**
     * 新增项目管理
     */
-    @SaCheckPermission("oa:project:add")
    @Log(title = "项目管理", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
@@ -112,7 +108,6 @@ public class SysOaProjectController extends BaseController {
    /**
     * 修改项目管理
     */
-    @SaCheckPermission("oa:project:edit")
    @Log(title = "项目管理", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
@@ -126,7 +121,6 @@ public class SysOaProjectController extends BaseController {
     *
     * @param projectIds 主键串
     */
-    @SaCheckPermission("oa:project:remove")
    @Log(title = "项目管理", businessType = BusinessType.DELETE)
    @DSTransactional
    @DeleteMapping("/{projectIds}")
@@ -138,7 +132,6 @@ public class SysOaProjectController extends BaseController {
    /**
     * 查询项目是否存在出库记录
     */
-    @SaCheckPermission("oa:project:list")
    @GetMapping("/outWare/list")
    public TableDataInfo<SysOaOutWarehouseListVo> outWareList(SysOaWarehouseDetailBo bo, PageQuery pageQuery) {
        return iSysOaProjectService.queryOutWarePageList(bo, pageQuery);