From 0e4534e51dbea1eb0b95d61cc7d0206022ead4a1 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期一, 29 三月 2021 17:31:21 +0800
Subject: [PATCH] update 项目管理/项目归档
---
src/main/java/com/whyc/controller/ProjectManageController.java | 94 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 75 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProjectManageController.java b/src/main/java/com/whyc/controller/ProjectManageController.java
index 0fc6848..c60e151 100644
--- a/src/main/java/com/whyc/controller/ProjectManageController.java
+++ b/src/main/java/com/whyc/controller/ProjectManageController.java
@@ -8,6 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import org.apache.ibatis.annotations.Delete;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -45,7 +46,7 @@
@GetMapping("byCondition")
@ApiOperation(notes = "椤圭洰杩囩▼绠＄悊",value = "椤圭洰杩囩▼绠＄悊-鏉′欢鏌ヨ")
public Response<List<ProjectManage>> searchByCondition(@ApiParam(value = "鐢虫姤鏃ユ湡 鏍煎紡 2021/01/28",required = true) @RequestParam Date proCreatedate,
- @ApiParam(value = "椤圭洰绫诲瀷",required = true)@RequestParam int proSort,
+ @ApiParam(value = "椤圭洰绫诲瀷",required = true)@RequestParam String proSort,
@ApiParam(value = "椤圭洰鐘舵��",required = true)@RequestParam int proState,
@ApiParam(value = "椤圭洰缂栧彿",required = true)@RequestParam String proNum) {
ProjectManage projectManage = new ProjectManage();
@@ -117,7 +118,7 @@
@GetMapping("managesState")
- @ApiOperation(notes = "椤圭洰绠＄悊-宸辩‘璁ら樁娈�", value = "椤圭洰绠＄悊-宸辩‘璁ら樁娈垫煡璇�")
+ @ApiOperation(notes = "", value = "椤圭洰绠＄悊-宸辩‘璁�/鏈‘璁ら樁娈垫煡璇�")
public Response<Object> searchManageStateByCondition(@ApiParam(value = "椤圭洰缂栧彿", required = true) @RequestParam String proNum,
@ApiParam(value = "椤圭洰鍚嶇О浠ｇ爜", required = true) @RequestParam String proNameCode) {
ProjectManage projectManage = new ProjectManage();
@@ -128,14 +129,14 @@
/**
- * 椤圭洰杩涘害纭 pro_progress
+ * 椤圭洰杩涘害纭 pro_progress,鏈綊妗ｅ彲浠ヤ慨鏀规洿鏂帮紝褰掓。鍚庝笉鑳戒慨鏀�
* @return
*/
@PutMapping("updateManageState")
- @ApiOperation(notes = "椤圭洰绠＄悊-宸辩‘璁ら樁娈�",value = "椤圭洰绠＄悊-宸辩‘璁ら樁娈垫洿鏂�")
+ @ApiOperation(notes = "椤圭洰杩涘害纭1-6 瀵瑰簲 绔嬮」-瀹℃壒-鐮旂┒-缁撻-楠屾敹-褰掓。",value = "椤圭洰绠＄悊-鏈‘璁ら樁娈垫洿鏂�")
public Response updateManageState(@ApiParam(value = "椤圭洰缂栧彿", required = true) @RequestParam String proNum,
@ApiParam(value = "椤圭洰鍚嶇О浠ｇ爜", required = true) @RequestParam String proNameCode,
- @ApiParam(value = "椤圭洰杩涘害纭0-6",required = true)@RequestParam int proProgress,
+ @ApiParam(value = "椤圭洰杩涘害纭1-6",required = true)@RequestParam int proProgress,
@ApiParam(value = "鏂囨。涓婁紶淇濆瓨鍦板潃(濡傛灉鏃犱紶绌哄瓧绗︿覆)",required = true)@RequestParam String proFilePath) {
ProjectManage projectManage = new ProjectManage();
projectManage.setProNum(proNum);
@@ -146,8 +147,8 @@
}
- @PutMapping("searchDoc")
- @ApiOperation(notes = "椤圭洰绠＄悊-宸辩‘璁ら樁娈�",value = "鏂囨。鏉愭枡鏌ヨ")
+ @GetMapping("searchDoc")
+ @ApiOperation(notes = "椤圭洰杩囩▼绠＄悊-椤圭洰绠＄悊",value = "鏂囨。鏉愭枡鏌ヨ")
public Response searchDocumentation(@ApiParam(value = "椤圭洰缂栧彿", required = true) @RequestParam String proNum,
@ApiParam(value = "椤圭洰鍚嶇О浠ｇ爜", required = true) @RequestParam String proNameCode){
ProjectArchiveManage projectArchiveManage = new ProjectArchiveManage();
@@ -157,8 +158,8 @@
}
- @PutMapping("delDoc")
- @ApiOperation(notes = "椤圭洰绠＄悊-宸辩‘璁ら樁娈�",value = "鏂囨。鏉愭枡鍒犻櫎")
+ @Delete("delDoc")
+ @ApiOperation(notes = "椤圭洰杩囩▼绠＄悊-椤圭洰绠＄悊-宸辩‘璁ら樁娈�",value = "鏂囨。鏉愭枡鍒犻櫎")
public Response delDocumentation(@ApiParam(value = "椤圭洰缂栧彿", required = true) @RequestParam String proNum,
@ApiParam(value = "椤圭洰鍚嶇О浠ｇ爜", required = true) @RequestParam String proNameCode,
@ApiParam(value = "鏂囨。璺緞", required = true) @RequestParam String proFilePath){
@@ -173,24 +174,79 @@
@ApiOperation(value = "椤圭洰褰掓。绠＄悊-鏌ヨ鎵�鏈�")
public Response<List<ProjectManage>> searchArchiveAll() {
- return archiveManageService.searchAll();
+ return archiveManageService.searchArchiveAll();
}
@GetMapping("archiveByCondition")
@ApiOperation(value = "椤圭洰褰掓。绠＄悊-鏉′欢鏌ヨ")
- public Response searchArchiveByCondition(@ApiParam(value = "寮�濮嬫棩鏈� 鏍煎紡 2021/01/28",required = true) @RequestParam Date gainDate,
- @ApiParam(value = "褰掓。鏃ユ湡",required = true)@RequestParam Date proArchiveDate,
- @ApiParam(value = "椤圭洰绫诲瀷",required = true)@RequestParam int proSort,
+ public Response searchArchiveByCondition(@ApiParam(value = "寮�濮嬫棩鏈� 鏍煎紡 2021/03/27",required = true) @RequestParam Date proExecutionDate,
+ @ApiParam(value = "褰掓。鏃ユ湡 鏍煎紡 2021/03/27",required = true)@RequestParam Date proArchiveDate,
+ @ApiParam(value = "椤圭洰绫诲瀷",required = true)@RequestParam String proSort,
@ApiParam(value = "椤圭洰缂栧彿",required = true)@RequestParam String proNum) {
- ProjectArchiveManage pam = new ProjectArchiveManage();
- pam.setGainDate(gainDate);
- pam.setProArchiveDate(proArchiveDate);
- pam.setProSort(proSort);
- pam.setProNum(proNum);
+ ProjectManage pm = new ProjectManage();
+ pm.setProExecutionDate(proExecutionDate);
+ pm.setProArchiveDate(proArchiveDate);
+ pm.setProSort(proSort);
+ pm.setProNum(proNum);
- return archiveManageService.searchArchiveByCondition(pam);
+ return archiveManageService.searchArchiveByCondition(pm);
}
+ @GetMapping("archiveProjectInfo")
+ @ApiOperation(value = "椤圭洰褰掓。绠＄悊-椤圭洰姒傚喌淇℃伅")
+ public Response searchArchiveProjectInfo(@ApiParam(value = "椤圭洰鍚嶇О浠ｇ爜", required = true) @RequestParam String proNameCode,
+ @ApiParam(value = "椤圭洰缂栧彿", required = true) @RequestParam String proNum) {
+
+ ProjectManage pm = new ProjectManage();
+ pm.setProNameCode(proNameCode);
+ pm.setProNum(proNum);
+
+ return archiveManageService.searchArchiveProjectInfo(pm);
+ }
+
+ /**
+ * @param proNameCode
+ * @param proNum
+ * @return 鏂囨。鏍煎紡銆佹枃妗ｅ悕绉般�佸綊妗ｆ棩鏈熴�佷笅杞借矾寰�
+ */
+ @GetMapping("archiveDocManager")
+ @ApiOperation(value = "椤圭洰褰掓。绠＄悊-鏂囨。绠＄悊")
+ public Response searchProjectDocByCondition(@ApiParam(value = "椤圭洰鍚嶇О浠ｇ爜", required = true) @RequestParam String proNameCode,
+ @ApiParam(value = "椤圭洰缂栧彿", required = true) @RequestParam String proNum) {
+ ProjectArchiveManage pam = new ProjectArchiveManage();
+ pam.setProNum(proNum);
+ pam.setProNameCode(proNameCode);
+
+ return archiveManageService.searchProjectDocByCondition(pam);
+ }
+
+ /**
+ * @param proNameCode
+ * @param proNum
+ * @return 瀹為獙鍚嶇О銆佷笂浼犳棩鏈熴�佸綊妗ｆ棩鏈� (鎿嶄綔TODO)
+ */
+ @GetMapping("archiveExperimentData")
+ @ApiOperation(notes = "(鎿嶄綔TODO)",value = "椤圭洰褰掓。绠＄悊-璇曢獙鏁版嵁")
+ public Response searchArchiveExperimentData(@ApiParam(value = "椤圭洰鍚嶇О浠ｇ爜", required = true) @RequestParam String proNameCode,
+ @ApiParam(value = "椤圭洰缂栧彿", required = true) @RequestParam String proNum) {
+ ProjectArchiveManage pam = new ProjectArchiveManage();
+ pam.setProNum(proNum);
+ pam.setProNameCode(proNameCode);
+ return archiveManageService.searchArchiveExperimentData(pam);
+ }
+
+ @GetMapping("archiveTechnologicalAchievements")
+ @ApiOperation(notes = "(鎿嶄綔TODO)", value = "椤圭洰褰掓。绠＄悊-绉戞妧鎴愭灉")
+ public Response searchArchiveTechnologicalAchievements(@ApiParam(value = "椤圭洰鍚嶇О浠ｇ爜", required = true) @RequestParam String proNameCode,
+ @ApiParam(value = "椤圭洰缂栧彿", required = true) @RequestParam String proNum) {
+ ProjectArchiveManage pam = new ProjectArchiveManage();
+ pam.setProNum(proNum);
+ pam.setProNameCode(proNameCode);
+ return archiveManageService.searchArchiveTechnologicalAchievements(pam);
+ }
+
+
+
/**
* 鏂囦欢涓婁紶
--
Gitblit v1.9.1