From 9e28453dba6ecf93c6c2234ba38def7c41cf12f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectInfoController.java | 16 ++++++++++++++--
1 files changed, 14 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 375f5ad..ee060f8 100644
--- a/business/src/main/java/com/ycl/controller/ProjectInfoController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectInfoController.java
@@ -8,6 +8,7 @@
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;
@@ -113,7 +114,10 @@
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) {
@@ -156,11 +160,19 @@
* @return
*/
@PostMapping("/import")
- public Result importProject(@RequestPart("file") MultipartFile file) {
+ 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