From 363cf83f55c886bacb8ccab451071442a3313e67 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 29 十一月 2024 04:04:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/java/com/ycl/controller/ProjectInfoController.java | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/business/src/main/java/com/ycl/controller/ProjectInfoController.java b/business/src/main/java/com/ycl/controller/ProjectInfoController.java index 7ce9b7c..f2e314c 100644 --- a/business/src/main/java/com/ycl/controller/ProjectInfoController.java +++ b/business/src/main/java/com/ycl/controller/ProjectInfoController.java @@ -4,13 +4,13 @@ import com.ycl.common.group.Add; import com.ycl.common.group.Update; import com.ycl.common.utils.ProjectCodeGenerator; +import com.ycl.domain.form.DocumentInfoForm; import com.ycl.domain.form.ProjectInfoForm; import com.ycl.domain.query.ProjectInfoQuery; import com.ycl.service.ProjectInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -38,7 +38,12 @@ public Result add(@RequestBody @Validated(Add.class) ProjectInfoForm form) { return projectInfoService.add(form); } - + @PostMapping("/document") + @ApiOperation(value = "娣诲姞鐩稿叧鏂囦欢", notes = "娣诲姞鐩稿叧鏂囦欢") +// @PreAuthorize("hasAuthority('projectInfo:add')") + public Result addDoc(@RequestBody @Validated(Add.class) DocumentInfoForm form) { + return projectInfoService.addDoc(form); + } @PutMapping @ApiOperation(value = "淇敼", notes = "淇敼") // @PreAuthorize("hasAuthority('projectInfo:edit')") @@ -73,7 +78,12 @@ public Result detail(@PathVariable("id") Integer id) { return projectInfoService.detail(id); } - + @GetMapping("/document/{id}") + @ApiOperation(value = "鐩稿叧鏂囦欢璇︽儏", notes = "鐩稿叧鏂囦欢璇︽儏") +// @PreAuthorize("hasAuthority('projectInfo:detail')") + public Result docDetail(@PathVariable("id") Integer id) { + return projectInfoService.docDetail(id); + } @GetMapping("/list") // @PreAuthorize("hasAuthority('projectInfo:list')") @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃") @@ -89,4 +99,9 @@ public Result generateProjectCode() { return Result.ok().data(ProjectCodeGenerator.generateProjectCode()); }; + + @GetMapping("/getManagerFlag/{recordId}") + public Result getManagerFlag(@PathVariable("recordId") Integer recordId) { + return projectInfoService.getManagerFlag(recordId); + } } -- Gitblit v1.8.0