From c773d0c150a4d90003bc7e3c776fe09e871cab30 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期二, 06 四月 2021 14:12:20 +0800
Subject: [PATCH] 更新试验数据管理
---
src/main/java/com/whyc/controller/ProjectManageController.java | 14 +++++---------
src/main/java/com/whyc/mapper/TestPlanMapper.java | 4 ++++
src/main/resources/mapper/TestPlanMapper.xml | 4 ++++
src/main/java/com/whyc/service/ProjectArchiveManageService.java | 28 ++++++++++++++++++++++++++++
4 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProjectManageController.java b/src/main/java/com/whyc/controller/ProjectManageController.java
index 055290c..e2f1c82 100644
--- a/src/main/java/com/whyc/controller/ProjectManageController.java
+++ b/src/main/java/com/whyc/controller/ProjectManageController.java
@@ -276,17 +276,13 @@
/**
* @param proNameCode
- * @param proNum
- * @return 瀹為獙鍚嶇О銆佷笂浼犳棩鏈熴�佸綊妗ｆ棩鏈� (鎿嶄綔TODO)
+ * @return 瀹為獙鍚嶇О銆佽瘯楠屾棩鏈熴�佺粨璁哄瓧娈� etc
*/
@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);
+ @ApiOperation(notes = "TODO 鏂囦欢鏍煎紡鍜屼笅杞藉湴鍧�", value = "椤圭洰褰掓。绠＄悊-璇曢獙鏁版嵁")
+ public Response searchArchiveExperimentData(@ApiParam(value = "椤圭洰鍚嶇О浠ｇ爜", required = true) @RequestParam String proNameCode) {
+ //TODO fileName file
+ return archiveManageService.searchArchiveExperimentData(proNameCode);
}
@GetMapping("archiveTechnologicalAchievements")
diff --git a/src/main/java/com/whyc/mapper/TestPlanMapper.java b/src/main/java/com/whyc/mapper/TestPlanMapper.java
index 4666f15..258a802 100644
--- a/src/main/java/com/whyc/mapper/TestPlanMapper.java
+++ b/src/main/java/com/whyc/mapper/TestPlanMapper.java
@@ -2,6 +2,10 @@
import com.whyc.pojo.TestPlan;
+import java.util.List;
+
public interface TestPlanMapper extends CustomMapper<TestPlan> {
+ //璇曢獙鏁版嵁
+ List<TestPlan> searchArchiveExperimentData(TestPlan testPlan);
}
diff --git a/src/main/java/com/whyc/service/ProjectArchiveManageService.java b/src/main/java/com/whyc/service/ProjectArchiveManageService.java
index 977c6e8..b2ee024 100644
--- a/src/main/java/com/whyc/service/ProjectArchiveManageService.java
+++ b/src/main/java/com/whyc/service/ProjectArchiveManageService.java
@@ -5,9 +5,11 @@
import com.whyc.dto.Response;
import com.whyc.mapper.ProjectArchiveManageMapper;
import com.whyc.mapper.ProjectManageMapper;
+import com.whyc.mapper.TestPlanMapper;
import com.whyc.pojo.ProjectArchiveExperiment;
import com.whyc.pojo.ProjectArchiveManage;
import com.whyc.pojo.ProjectManage;
+import com.whyc.pojo.TestPlan;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -23,6 +25,7 @@
@Resource
private ProjectManageMapper projectManageMapper;
+
public Response searchDocumentation(ProjectArchiveManage pam) {
@@ -169,6 +172,7 @@
* @param pam
* @return
*/
+ @Deprecated
public Response searchArchiveExperimentData(ProjectArchiveManage pam) {
Response<Object> response = new Response<>();
List<ProjectArchiveExperiment> lists = projectArchiveManageMapper.searchArchiveExperimentData(pam);
@@ -245,4 +249,28 @@
}
return response;
}
+
+
+
+ @Resource
+ private TestPlanMapper testPlanMapper;
+ /**
+ * 椤圭洰褰掓。绠＄悊-璇曢獙鏁版嵁绠＄悊
+ * @param proNameCode
+ * @return
+ */
+ public Response searchArchiveExperimentData(String proNameCode) {
+ Response<Object> response = new Response<>();
+ try {
+ TestPlan testPlan = new TestPlan();
+ testPlan.setProId(proNameCode);
+ List<TestPlan> lists = testPlanMapper.searchArchiveExperimentData(testPlan);
+ response.setMsg(1, "鏌ヨ鎴愬姛");
+ response.setData(lists);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return response.setMsg(0, "鏌ヨ澶辫触");
+ }
+ return response;
+ }
}
diff --git a/src/main/resources/mapper/TestPlanMapper.xml b/src/main/resources/mapper/TestPlanMapper.xml
index d9002da..d222793 100644
--- a/src/main/resources/mapper/TestPlanMapper.xml
+++ b/src/main/resources/mapper/TestPlanMapper.xml
@@ -2,4 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.TestPlanMapper" >
+ <select id="searchArchiveExperimentData" resultType="com.whyc.pojo.TestPlan">
+ SELECT plan_name,create_time,conclusion FROM db_experiment.tb_test_plan WHERE pro_id = #{proId}
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1