进度计划菜单

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/controller/PgsConstructionSchedulePlanController.java

@@ -16,6 +16,8 @@ import org.dromara.progress.domain.PgsConstructionSchedulePlan;
 import org.dromara.progress.domain.dto.constructionscheduleplan.*;
 import org.dromara.progress.domain.vo.constructionscheduleplan.PgsConstructionSchedulePlanVo;
 import org.dromara.progress.service.IPgsConstructionSchedulePlanService;
+import org.dromara.project.domain.vo.project.BusProjectStructureVo;
+import org.dromara.project.service.IBusProjectService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -36,6 +38,21 @@ public class PgsConstructionSchedulePlanController extends BaseController {
     @Resource
     private IPgsConstructionSchedulePlanService pgsConstructionSchedulePlanService;
 
+    @Resource
+    private IBusProjectService projectService;
+
+    /**
+     * 获取项目结构
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("progress:constructionSchedulePlan:list")
+    @GetMapping("/projectStructure/{id}")
+    public R<BusProjectStructureVo> getProjectStructure(@NotNull(message = "主键不能为空")
+                                                        @PathVariable Long id) {
+        return R.ok(projectService.getStructure(id));
+    }
+
     /**
      * 查询施工进度计划列表
      */
@@ -60,7 +77,7 @@ public class PgsConstructionSchedulePlanController extends BaseController {
     /**
      * 根据项目id导出施工进度计划模版
      */
-    @SaCheckPermission("progress:constructionSchedulePlan:exportTemplate")
+    @SaCheckPermission("progress:constructionSchedulePlan:export")
     @Log(title = "施工进度计划", businessType = BusinessType.EXPORT)
     @PostMapping("/exportTemplate/{projectId}")
     public void exportExcelByProjectId(@NotNull(message = "项目id不能为空")
@@ -71,7 +88,7 @@ public class PgsConstructionSchedulePlanController extends BaseController {
     /**
      * 读取施工进度计划模版
      */
-    @SaCheckPermission("progress:constructionSchedulePlan:readTemplate")
+    @SaCheckPermission("progress:constructionSchedulePlan:import")
     @Log(title = "施工进度计划", businessType = BusinessType.IMPORT)
     @PostMapping("/readTemplate")
     public R<Void> readExcel(@RequestParam("file") MultipartFile file, Long projectId) {
@@ -121,7 +138,7 @@ public class PgsConstructionSchedulePlanController extends BaseController {
      * 修改施工进度计划为完成状态
      *
      */
-    @SaCheckPermission("progress:constructionSchedulePlan:editFinish")
+    @SaCheckPermission("progress:constructionSchedulePlan:edit")
     @Log(title = "施工进度计划", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/finish")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/controller/PgsProgressCategoryController.java

@@ -49,7 +49,7 @@ public class PgsProgressCategoryController extends BaseController {
     /**
      * 根据进度父级查询进度类别列表
      */
-    @SaCheckPermission("progress:progressCategory:listByParent")
+    @SaCheckPermission("progress:progressCategory:list")
     @GetMapping("/listByParent")
     public R<List<PgsProgressCategoryVo>> listByParent(PgsProgressCategoryQueryByParentReq req) {
         List<PgsProgressCategoryVo> list = pgsProgressCategoryService.queryListByParent(req);
@@ -59,7 +59,7 @@ public class PgsProgressCategoryController extends BaseController {
     /**
      * 根据进度父级查询进度类别列表已完成产值
      */
-    @SaCheckPermission("progress:progressCategory:listByParent")
+    @SaCheckPermission("progress:progressCategory:list")
     @GetMapping("/getValueByParentId")
     public R<PgsProgressCategoryValueVo> getValueByParentId(PgsProgressCategoryQueryByParentReq req) {
         return R.ok(pgsProgressCategoryService.getValueByParentId(req));
@@ -68,7 +68,7 @@ public class PgsProgressCategoryController extends BaseController {
     /**
      * 根据项目获取进度类别模版顶级目录列表
      */
-    @SaCheckPermission("progress:progressCategory:listTopByProjectId")
+    @SaCheckPermission("progress:progressCategory:list")
     @GetMapping("/listTopByProjectId/{projectId}")
     public R<List<PgsProgressCategoryTopVo>> listTopByProjectId(@NotNull(message = "项目id不能为空")
                                                                 @PathVariable Long projectId) {
@@ -168,7 +168,7 @@ public class PgsProgressCategoryController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("progress:progressCategory:coordinate")
+    @SaCheckPermission("progress:progressCategory:list")
     @GetMapping("/coordinate/{id}")
     public R<PgsProgressCategoryCoordinateVo> getCoordinate(@NotNull(message = "主键不能为空")
                                                             @PathVariable Long id) {
@@ -180,7 +180,7 @@ public class PgsProgressCategoryController extends BaseController {
      *
      * @param projectId 项目主键
      */
-    @SaCheckPermission("progress:progressCategory:projectNumber")
+    @SaCheckPermission("progress:progressCategory:query")
     @GetMapping("/project/number/{projectId}")
     public R<PgsProgressCategoryProjectVo> getProjectNumber(@NotNull(message = "项目主键不能为空")
                                                             @PathVariable Long projectId) {
@@ -192,7 +192,7 @@ public class PgsProgressCategoryController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("progress:progressCategory:lastTime")
+    @SaCheckPermission("progress:progressCategory:add")
     @GetMapping("/lastTime/{id}")
     public R<PgsProgressCategoryLastTimeVo> getLastTimeInfo(@NotNull(message = "主键不能为空")
                                                             @PathVariable Long id) {
@@ -214,7 +214,7 @@ public class PgsProgressCategoryController extends BaseController {
     /**
      * 新增分项工程单价
      */
-    @SaCheckPermission("progress:progressCategory:price")
+    @SaCheckPermission("progress:progressCategory:edit")
     @Log(title = "进度类别", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/price")
@@ -247,7 +247,7 @@ public class PgsProgressCategoryController extends BaseController {
     /**
      * 批量新增设施进度类别
      */
-    @SaCheckPermission("progress:progressCategory:add")
+    @SaCheckPermission("progress:progressCategory:edit")
     @Log(title = "进度类别", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/batch/facility")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/controller/PgsProgressCategoryTemplateController.java

@@ -19,6 +19,8 @@ import org.dromara.progress.domain.dto.progresscategorytemplate.PgsProgressCateg
 import org.dromara.progress.domain.dto.progresscategorytemplate.PgsProgressCategoryTemplateUpdateReq;
 import org.dromara.progress.domain.vo.progresscategorytemplate.PgsProgressCategoryTemplateVo;
 import org.dromara.progress.service.IPgsProgressCategoryTemplateService;
+import org.dromara.project.domain.vo.project.BusSubProjectVo;
+import org.dromara.project.service.IBusProjectService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,10 +40,23 @@ public class PgsProgressCategoryTemplateController extends BaseController {
     @Resource
     private IPgsProgressCategoryTemplateService pgsProgressCategoryTemplateService;
 
+    @Resource
+    private IBusProjectService projectService;
+
+    /**
+     * 查询项目下的子项目列表
+     */
+    @SaCheckPermission("progress:progressCategoryTemplate:list")
+    @GetMapping("/list/sub/{id}")
+    public R<List<BusSubProjectVo>> listSubProject(@NotNull(message = "项目id不能为空")
+                                                   @PathVariable Long id) {
+        return R.ok(projectService.querySubList(id));
+    }
+
     /**
      * 分页查询进度类别模版列表
      */
-    @SaCheckPermission("progress:progressCategoryTemplate:page")
+    @SaCheckPermission("progress:progressCategoryTemplate:list")
     @GetMapping("/page")
     public TableDataInfo<PgsProgressCategoryTemplateVo> page(PgsProgressCategoryTemplateQueryReq req, PageQuery pageQuery) {
         return pgsProgressCategoryTemplateService.queryPageList(req, pageQuery);
@@ -60,7 +75,7 @@ public class PgsProgressCategoryTemplateController extends BaseController {
     /**
      * 根据进度父级查询进度类别模版列表
      */
-    @SaCheckPermission("progress:progressCategoryTemplate:listByParent")
+    @SaCheckPermission("progress:progressCategoryTemplate:list")
     @GetMapping("/listByParent")
     public R<List<PgsProgressCategoryTemplateVo>> listByParent(PgsProgressCategoryTemplateQueryByParentReq req) {
         List<PgsProgressCategoryTemplateVo> list = pgsProgressCategoryTemplateService.queryListByParent(req);
@@ -70,7 +85,7 @@ public class PgsProgressCategoryTemplateController extends BaseController {
     /**
      * 获取系统顶级进度类别模版列表
      */
-    @SaCheckPermission("progress:progressCategoryTemplate:listSystemTop")
+    @SaCheckPermission("progress:progressCategoryTemplate:list")
     @GetMapping("/listSystemTop/{projectId}")
     public R<List<PgsProgressCategoryTemplateVo>> listSystemTop(@NotNull(message = "项目主键不能为空")
                                                                 @PathVariable Long projectId) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/controller/PgsProgressPlanController.java

@@ -39,7 +39,7 @@ public class PgsProgressPlanController extends BaseController {
     /**
      * 查询进度计划列表
      */
-    @SaCheckPermission("progress:progressPlan:list")
+    @SaCheckPermission("progress:progressCategory:list")
     @GetMapping("/list")
     public TableDataInfo<PgsProgressPlanVo> list(PgsProgressPlanQueryReq req, PageQuery pageQuery) {
         return pgsProgressPlanService.queryPageList(req, pageQuery);
@@ -48,7 +48,7 @@ public class PgsProgressPlanController extends BaseController {
     /**
      * 导出进度计划列表
      */
-    @SaCheckPermission("progress:progressPlan:export")
+    @SaCheckPermission("progress:progressCategory:export")
     @Log(title = "进度计划", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(PgsProgressPlanQueryReq req, HttpServletResponse response) {
@@ -61,7 +61,7 @@ public class PgsProgressPlanController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("progress:progressPlan:query")
+    @SaCheckPermission("progress:progressCategory:query")
     @GetMapping("/{id}")
     public R<PgsProgressPlanVo> getInfo(@NotNull(message = "主键不能为空")
                                         @PathVariable Long id) {
@@ -71,7 +71,7 @@ public class PgsProgressPlanController extends BaseController {
     /**
      * 新增进度计划
      */
-    @SaCheckPermission("progress:progressPlan:add")
+    @SaCheckPermission("progress:progressCategory:add")
     @Log(title = "进度计划", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -84,7 +84,7 @@ public class PgsProgressPlanController extends BaseController {
      *
      * @param ids 主键
      */
-    @SaCheckPermission("progress:progressPlan:remove")
+    @SaCheckPermission("progress:progressCategory:remove")
     @Log(title = "进度计划", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/controller/PgsProgressPlanDetailController.java

@@ -33,7 +33,7 @@ public class PgsProgressPlanDetailController extends BaseController {
     /**
      * 查询进度计划详情列表
      */
-    @SaCheckPermission("progress:progressPlanDetail:list")
+    @SaCheckPermission("progress:progressCategory:list")
     @GetMapping("/list")
     public TableDataInfo<PgsProgressPlanDetailVo> list(PgsProgressPlanDetailQueryReq req, PageQuery pageQuery) {
         return pgsProgressPlanDetailService.queryPageList(req, pageQuery);
@@ -42,7 +42,7 @@ public class PgsProgressPlanDetailController extends BaseController {
     /**
      * 新增进度计划详情（普通设施）
      */
-    @SaCheckPermission("progress:progressPlanDetail:insertDetail")
+    @SaCheckPermission("progress:progressCategory:add")
     @RepeatSubmit()
     @PostMapping("/insert/detail")
     public R<Void> insertFinishedDetail(@Validated @RequestBody PgsProgressPlanDetailFinishedCreateReq req) {
@@ -52,7 +52,7 @@ public class PgsProgressPlanDetailController extends BaseController {
     /**
      * 新增进度计划详情（百分比设施）
      */
-    @SaCheckPermission("progress:progressPlanDetail:insertPercentage")
+    @SaCheckPermission("progress:progressCategory:add")
     @RepeatSubmit()
     @PostMapping("/insert/percentage")
     public R<Void> insertPercentageDetail(@Validated @RequestBody PgsProgressPlanDetailCreateReq req) {
@@ -72,7 +72,7 @@ public class PgsProgressPlanDetailController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("progress:progressPlanDetail:detailFinished")
+    @SaCheckPermission("progress:progressCategory:query")
     @GetMapping("/detail/finished/{id}")
     public TableDataInfo<PgsProgressPlanDetailFinishedVo> getFinishedDetail(@NotNull(message = "主键不能为空")
                                                                             @PathVariable Long id,
@@ -85,7 +85,7 @@ public class PgsProgressPlanDetailController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("progress:progressPlanDetail:detailUnFinish")
+    @SaCheckPermission("progress:progressCategory:query")
     @GetMapping("/detail/unFinish/{id}")
     public TableDataInfo<PgsProgressPlanDetailUnFinishVo> getUnFinishDetail(@NotNull(message = "主键不能为空")
                                                                             @PathVariable Long id,
@@ -96,7 +96,7 @@ public class PgsProgressPlanDetailController extends BaseController {
     /**
      * 删除进度计划详情
      */
-    @SaCheckPermission("progress:progressPlanDetail:removeDetail")
+    @SaCheckPermission("progress:progressCategory:remove")
     @RepeatSubmit()
     @DeleteMapping("/remove/detail")
     public R<Void> removeDetail(@Validated PgsProgressPlanDetailRemoveReq req) {