From d132fff555c03c097a8810d5b78a69da8d369353 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期三, 31 三月 2021 17:29:46 +0800
Subject: [PATCH] 修改查询条件
---
src/main/java/com/whyc/service/ProjectProcessManageService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProjectProcessManageService.java b/src/main/java/com/whyc/service/ProjectProcessManageService.java
index 146c081..99da4ba 100644
--- a/src/main/java/com/whyc/service/ProjectProcessManageService.java
+++ b/src/main/java/com/whyc/service/ProjectProcessManageService.java
@@ -82,6 +82,7 @@
if (bl) {
ArrayList<String> list = pm.getFileList();
if (null != list) {
+ Date proUploadDate = new Date();
for (int i = 0; i < list.size(); i++) {
ProjectArchiveManage pam = new ProjectArchiveManage();
pam.setProNum(pm.getProNum());
@@ -94,7 +95,7 @@
int rexIdex = split[1].lastIndexOf(".");
pam.setProDocumentName(split[1].substring(0, rexIdex));
pam.setProDocumentFormat(split[1].substring(rexIdex + 1));
- pam.setProUploadDate(new Date());
+ pam.setProUploadDate(proUploadDate);
projectArchiveManageMapper.insert(pam);
}
}
@@ -200,10 +201,17 @@
*/
public Response updateProjectProgress(ProjectManage progress) {
Response<Object> response = new Response<>();
- boolean b = projectManageMapper.updateProjectProgress(progress) > 0;
- if (b) {
+ 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);
response.setMsg(1, "鏇存柊鎴愬姛");
} else {
+ dataSourceTransactionManager.rollback(transactionStatus);
response.setMsg(0, "鏇存柊澶辫触");
}
return response;
--
Gitblit v1.9.1