From e741864c61d3e2238a5fa233e3820dd3831ab941 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 10 二月 2025 16:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 business/src/main/java/com/ycl/controller/ProjectInfoController.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 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 b082e4d..ee060f8 100644
--- a/business/src/main/java/com/ycl/controller/ProjectInfoController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectInfoController.java
@@ -1,12 +1,14 @@
 package com.ycl.controller;
 
 import com.ycl.common.base.Result;
+import com.ycl.common.exception.base.BaseException;
 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.ProjectForm;
 import com.ycl.domain.form.ProjectInfoForm;
 import com.ycl.domain.query.ProjectExportQuery;
 import com.ycl.domain.query.ProjectInfoQuery;
@@ -16,6 +18,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
@@ -44,12 +47,14 @@
     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')")
@@ -84,12 +89,14 @@
     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 = "鍒楄〃")
@@ -99,12 +106,18 @@
 
     /**
      * 鐢熸垚椤圭洰缂栧彿
+     *
      * @return 椤圭洰缂栧彿
      */
     @GetMapping("/getProjectCode")
     public Result generateProjectCode() {
         return Result.ok().data(ProjectCodeGenerator.generateProjectCode());
-    };
+    }
+
+    @GetMapping("/searchByKey")
+    public Result searchByKey(@RequestParam(required = false) String wordKey) {
+        return projectInfoService.searchByKey(wordKey);
+    }
 
     @GetMapping("/getManagerFlag/{recordId}")
     public Result getManagerFlag(@PathVariable("recordId") Integer recordId) {
@@ -113,17 +126,19 @@
 
     /**
      * 瀵煎嚭妯℃澘
+     *
      * @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);
+        OutputExcelUtils.export(response, "瀵煎叆妯℃澘", "椤圭洰淇℃伅", null, ProjectExcelTemplate.class, fieldList);
     }
 
     /**
      * 椤圭洰瀵煎嚭
+     *
      * @param response
      * @throws IOException
      */
@@ -131,4 +146,33 @@
     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);
+    }
+
+    /**
+     * 椤圭洰瀵煎叆
+     * @param file
+     * @return
+     */
+    @PostMapping("/import")
+    public Result importProject(MultipartFile file) {
+        if (file.getSize() > 100 * 1024 * 1024) {
+            throw new BaseException("鏂囦欢杩囧ぇ锛屾枃浠朵笉寰楄秴杩�100MB");
+        }
+        projectInfoService.importProject(file);
+        return Result.ok();
+    }
+
+    @PostMapping("/editProject")
+    public Result editProject(@RequestBody ProjectForm form) {
+        return projectInfoService.editProject(form);
+    }
+
+
+
 }

--
Gitblit v1.8.0