From b24e024f386e7f25a071b58e9267a2c19f20ba1e Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 10 十二月 2024 18:11:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 business/src/main/java/com/ycl/controller/ProjectInfoController.java |   63 ++++++++++++++++++++++++++++++-
 1 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/business/src/main/java/com/ycl/controller/ProjectInfoController.java b/business/src/main/java/com/ycl/controller/ProjectInfoController.java
index cac7115..963dfee 100644
--- a/business/src/main/java/com/ycl/controller/ProjectInfoController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectInfoController.java
@@ -4,7 +4,11 @@
 import com.ycl.common.group.Add;
 import com.ycl.common.group.Update;
 import com.ycl.common.utils.ProjectCodeGenerator;
+import com.ycl.common.utils.excel.OutputExcelUtils;
+import com.ycl.domain.excel.ProjectExcelTemplate;
+import com.ycl.domain.form.DocumentInfoForm;
 import com.ycl.domain.form.ProjectInfoForm;
+import com.ycl.domain.query.ProjectExportQuery;
 import com.ycl.domain.query.ProjectInfoQuery;
 import com.ycl.service.ProjectInfoService;
 import io.swagger.annotations.Api;
@@ -13,7 +17,10 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -38,6 +45,13 @@
         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')")
@@ -48,7 +62,7 @@
     @DeleteMapping("/{id}")
     @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
 //    @PreAuthorize("hasAuthority('projectInfo:del')")
-    public Result removeById(@PathVariable("id") String id) {
+    public Result removeById(@PathVariable("id") Long id) {
         return projectInfoService.removeById(id);
     }
 
@@ -73,6 +87,13 @@
         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 = "鍒楄〃")
@@ -82,10 +103,48 @@
 
     /**
      * 鐢熸垚椤圭洰缂栧彿
+     *
      * @return 椤圭洰缂栧彿
      */
     @GetMapping("/getProjectCode")
     public Result generateProjectCode() {
         return Result.ok().data(ProjectCodeGenerator.generateProjectCode());
-    };
+    }
+
+    ;
+
+    @GetMapping("/getManagerFlag/{recordId}")
+    public Result getManagerFlag(@PathVariable("recordId") Integer recordId) {
+        return projectInfoService.getManagerFlag(recordId);
+    }
+
+    /**
+     * 瀵煎嚭妯℃澘
+     *
+     * @param response
+     * @return
+     */
+    @PostMapping("/export/template")
+    public void exportTemplate(HttpServletResponse response) throws IOException {
+        List<String> fieldList = new ArrayList<>();
+        OutputExcelUtils.export(response, "瀵煎叆妯℃澘", "椤圭洰淇℃伅", null, ProjectExcelTemplate.class, fieldList);
+    }
+
+    /**
+     * 椤圭洰瀵煎嚭
+     *
+     * @param response
+     * @throws IOException
+     */
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ProjectExportQuery query) throws IOException {
+        projectInfoService.export(response, query);
+    }
+
+    @PutMapping("usedStatus/{id}/{usedStatus}")
+    @ApiOperation(value = "淇敼浣跨敤鐘舵��", notes = "淇敼浣跨敤鐘舵��")
+//    @PreAuthorize("hasAuthority('projectInfo:edit')")
+    public Result updateUsedStatus(@PathVariable Integer id, @PathVariable Integer usedStatus) {
+        return projectInfoService.updateUsedStatus(id, usedStatus);
+    }
 }

--
Gitblit v1.8.0