From 3e9ea659ab76fa036390c49ca63e6f64fc451598 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期四, 01 四月 2021 11:46:17 +0800
Subject: [PATCH] 修改 项目管理更新
---
src/main/java/com/whyc/service/ProjectProcessManageService.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProjectProcessManageService.java b/src/main/java/com/whyc/service/ProjectProcessManageService.java
index 99da4ba..d5d66a7 100644
--- a/src/main/java/com/whyc/service/ProjectProcessManageService.java
+++ b/src/main/java/com/whyc/service/ProjectProcessManageService.java
@@ -70,7 +70,8 @@
public Response add(ProjectManage pm) {
Response response = new Response<>();
pm.setProNameCode(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
- pm.setProProgress(1);//绔嬮」
+ pm.setProState(1);//椤圭洰鐘舵�� 杩涜涓�
+ pm.setProProgress(1);//椤圭洰杩涘害 绔嬮」
Integer num = projectManageMapper.checkUniqueId(pm);
if (num > 0) {
return response.setMsg(0, "娣诲姞澶辫触锛宲ro_name_code閲嶅");
@@ -134,7 +135,7 @@
for (int i = 0; i < pams.size(); i++) {
ProjectArchiveManage pam = pams.get(i);
HashMap<Object, Object> mapDoc = new HashMap<>();
- mapDoc.put("fileName", pam.getProDocumentName());
+ mapDoc.put("name", pam.getProDocumentName());
mapDoc.put("url", pam.getProFilePath());
list.add(mapDoc);
}
@@ -163,30 +164,36 @@
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
try {
bl = projectManageMapper.updateManageState(pm) > 0;
- String path = pm.getNote().trim();
- if (path.length() > 10) {
- ProjectArchiveManage pam = new ProjectArchiveManage();
- pam.setProNum(pm.getProNum());
- pam.setProName(pm.getProName());
- pam.setProNameCode(pm.getProNameCode());//鍞竴
- pam.setProSort(pm.getProSort());
- pam.setProFilePath(path);
- String[] split = path.split("-");
- int rexIdex = split[1].lastIndexOf(".");
- pam.setProDocumentName(split[1].substring(0, rexIdex));
- pam.setProDocumentFormat(split[1].substring(rexIdex + 1));
- projectArchiveManageMapper.insert(pam);
+ ArrayList<String> fileList = pm.getFileList();
+ if (bl&&null != fileList) {
+ for (int i = 0; i < fileList.size(); i++) {
+ String filePath = fileList.get(i);
+ Boolean fileExist = projectArchiveManageMapper.checkFileExist(filePath)>0;
+ if (!fileExist) {
+ ProjectArchiveManage pam = new ProjectArchiveManage();
+ pam.setProNum(pm.getProNum());
+ pam.setProName(pm.getProName());
+ pam.setProNameCode(pm.getProNameCode());//鍞竴
+ pam.setProSort(pm.getProSort());
+ pam.setProFilePath(filePath);
+ String[] split = filePath.split("_");
+ int rexIdex = split[1].lastIndexOf(".");
+ pam.setProDocumentName(split[1].substring(0, rexIdex));
+ pam.setProDocumentFormat(split[1].substring(rexIdex + 1));
+ projectArchiveManageMapper.insert(pam);
+ }
+ }
}
- response.setMsg(1, "鏇存柊鎴愬姛");
} catch (Exception e) {
e.printStackTrace();
dataSourceTransactionManager.rollback(transactionStatus);
return response.setMsg(0, "鏇存柊澶辫触");
}
if (bl) {
+ response.setMsg(1, "鏇存柊鎴愬姛");
dataSourceTransactionManager.commit(transactionStatus);
} else {
-
+ response.setMsg(0, "鏇存柊澶辫触");
dataSourceTransactionManager.rollback(transactionStatus);
}
return response;
--
Gitblit v1.9.1