From 7d64716cb0d406f21cde03976fd273bd07fdc06f Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 28 九月 2021 11:44:28 +0800
Subject: [PATCH] 更新用户-角色-菜单-权限

---
 src/main/java/com/whyc/service/ProjectArchiveManageService.java |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/service/ProjectArchiveManageService.java b/src/main/java/com/whyc/service/ProjectArchiveManageService.java
index 79cfdaf..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) {
 
@@ -48,10 +51,11 @@
 
     public Response delDocumentation(ProjectArchiveManage pam) {
         Response<Object> response = new Response<>();
+        boolean bl;
         try {
-            projectArchiveManageMapper.delDocumentation(pam);
+            bl = projectArchiveManageMapper.delDocumentation(pam) > 0;
             File file = new File(pam.getProFilePath());
-            if (file.exists()){
+            if (file.exists()) {
                 File absoluteFile = file.getAbsoluteFile();
                 String name = absoluteFile.getName();
                 file.delete();
@@ -62,9 +66,14 @@
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return response.setMsg(0,"鍒犻櫎澶辫触");
+            return response.setMsg(0, "鍒犻櫎澶辫触");
         }
-        response.setMsg(1,"鍒犻櫎鎴愬姛");
+        if (bl) {
+            response.setMsg(1, "鍒犻櫎鎴愬姛");
+        } else {
+            response.setMsg(0, "鍒犻櫎澶辫触");
+        }
+
         return response;
     }
 
@@ -163,6 +172,7 @@
      * @param pam
      * @return
      */
+    @Deprecated
     public Response searchArchiveExperimentData(ProjectArchiveManage pam) {
         Response<Object> response = new Response<>();
         List<ProjectArchiveExperiment> lists = projectArchiveManageMapper.searchArchiveExperimentData(pam);
@@ -239,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;
+    }
 }

--
Gitblit v1.9.1