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/service/ProjectProcessManageService.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProjectProcessManageService.java b/src/main/java/com/whyc/service/ProjectProcessManageService.java
index fd7f6f0..ef0c207 100644
--- a/src/main/java/com/whyc/service/ProjectProcessManageService.java
+++ b/src/main/java/com/whyc/service/ProjectProcessManageService.java
@@ -14,7 +14,9 @@
import org.springframework.transaction.TransactionStatus;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
@Service
@@ -75,7 +77,6 @@
pam.setProDocumentName(split[1].substring(0, rexIdex));
pam.setProDocumentFormat(split[1].substring(rexIdex + 1));
pam.setProUploadDate(new Date());
- pam.setGainDate(new Date());
projectArchiveManageMapper.insert(pam);
}
}
@@ -96,7 +97,7 @@
/**
- * 椤圭洰绠＄悊
+ * 椤圭洰杩囩▼绠＄悊/宸辩‘璁ゃ�佹湭纭闃舵
* @param projectManage
* @return
*/
@@ -104,13 +105,27 @@
Response response = new Response<>();
try {
- List<ProjectManage> projectManages = projectManageMapper.searchManageStateByCondition(projectManage);
+ ProjectManage pm = projectManageMapper.searchManageStateByCondition(projectManage);
+ List<ProjectArchiveManage> pams = projectArchiveManageMapper.searchByConditionDocumentPath(projectManage);
+ HashMap<Object, Object> map = new HashMap<>();
+ map.put("椤圭洰绠＄悊", pm);
+ ArrayList<Object> list = new ArrayList<>();
+ if (null != pams) {
+ for (int i = 0; i < pams.size(); i++) {
+ ProjectArchiveManage pam = pams.get(i);
+ HashMap<Object, Object> mapDoc = new HashMap<>();
+ mapDoc.put("鏂囦欢鍚�", pam.getProDocumentName());
+ mapDoc.put("鏂囦欢璺緞", pam.getProFilePath());
+ list.add(mapDoc);
+ }
+ }
+ map.put("鏂囨。鏉愭枡", list);
response.setCode(1);
- response.setMsg(1,"鏌ヨ鎴愬姛");
- response.setData(projectManages);
+ response.setMsg(1, "鏌ヨ鎴愬姛");
+ response.setData(map);
} catch (Exception e) {
e.printStackTrace();
- return response.setMsg(0,"鏌ヨ澶辫触");
+ return response.setMsg(0, "鏌ヨ澶辫触");
}
return response;
}
@@ -118,7 +133,7 @@
/**
* 椤圭洰杩涘害纭
- *
+ *鏈綊妗ｅ彲浠ヤ慨鏀规洿鏂帮紝褰掓。鍚庝笉鑳戒慨鏀�
* @param pm
* @return
*/
--
Gitblit v1.9.1