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/ProjectProcessManageService.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProjectProcessManageService.java b/src/main/java/com/whyc/service/ProjectProcessManageService.java
index d5d66a7..7d37ecc 100644
--- a/src/main/java/com/whyc/service/ProjectProcessManageService.java
+++ b/src/main/java/com/whyc/service/ProjectProcessManageService.java
@@ -48,6 +48,7 @@
/**
* 鏍规嵁绛涢�夋潯浠�
+ *
* @param pageNum
* @param pageSize
* @param projectManage
@@ -119,6 +120,7 @@
/**
* 椤圭洰杩囩▼绠＄悊/宸辩‘璁ゃ�佹湭纭闃舵
+ *
* @param projectManage
* @return
*/
@@ -154,7 +156,8 @@
/**
* 椤圭洰杩涘害纭
- *鏈綊妗ｅ彲浠ヤ慨鏀规洿鏂帮紝褰掓。鍚庝笉鑳戒慨鏀�
+ * 鏈綊妗ｅ彲浠ヤ慨鏀规洿鏂帮紝褰掓。鍚庝笉鑳戒慨鏀�
+ *
* @param pm
* @return
*/
@@ -165,10 +168,10 @@
try {
bl = projectManageMapper.updateManageState(pm) > 0;
ArrayList<String> fileList = pm.getFileList();
- if (bl&&null != fileList) {
+ if (bl && null != fileList) {
for (int i = 0; i < fileList.size(); i++) {
String filePath = fileList.get(i);
- Boolean fileExist = projectArchiveManageMapper.checkFileExist(filePath)>0;
+ Boolean fileExist = projectArchiveManageMapper.checkFileExist(filePath) > 0;
if (!fileExist) {
ProjectArchiveManage pam = new ProjectArchiveManage();
pam.setProNum(pm.getProNum());
@@ -176,6 +179,7 @@
pam.setProNameCode(pm.getProNameCode());//鍞竴
pam.setProSort(pm.getProSort());
pam.setProFilePath(filePath);
+ pam.setProUploadDate(new Date());
String[] split = filePath.split("_");
int rexIdex = split[1].lastIndexOf(".");
pam.setProDocumentName(split[1].substring(0, rexIdex));
@@ -203,22 +207,18 @@
/**
* 椤圭洰杩涘害绠＄悊
* 椤圭洰杩涘害锛�1-6 绔嬮」銆佸鎵广�佺爺绌躲�佺粨棰樸�侀獙鏀躲�佸綊妗ｏ級
+ *
* @param progress
* @return
*/
public Response updateProjectProgress(ProjectManage progress) {
Response<Object> response = new Response<>();
- TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
progress.setProArchiveDate(new Date());
boolean bl = projectManageMapper.updateProjectProgress(progress) > 0;
if (bl) {
- bl = projectArchiveManageMapper.updateProjectProgress(progress) > 0;
- }
- if (bl) {
- dataSourceTransactionManager.commit(transactionStatus);
+ projectArchiveManageMapper.updateProjectProgress(progress);//鏈夋枃妗ｆ潗鏂欏氨澧炲姞褰掓。鏃堕棿
response.setMsg(1, "鏇存柊鎴愬姛");
} else {
- dataSourceTransactionManager.rollback(transactionStatus);
response.setMsg(0, "鏇存柊澶辫触");
}
return response;
--
Gitblit v1.9.1