From 862408c8749d6150ed1a3703b49dbcfef306782c Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 12 一月 2024 13:26:29 +0800
Subject: [PATCH] 锁定/解锁日志
---
src/main/java/com/whyc/service/TechnicalSpecificationService.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/TechnicalSpecificationService.java b/src/main/java/com/whyc/service/TechnicalSpecificationService.java
index 9b76a18..94fb27d 100644
--- a/src/main/java/com/whyc/service/TechnicalSpecificationService.java
+++ b/src/main/java/com/whyc/service/TechnicalSpecificationService.java
@@ -8,6 +8,7 @@
import com.whyc.dto.Response;
import com.whyc.mapper.TechnicalSpecificationMapper;
import com.whyc.pojo.TechnicalSpecification;
+import com.whyc.pojo.TechnicalSpecificationLockLog;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
import com.whyc.util.DateUtil;
@@ -42,7 +43,7 @@
private ProductHistoryService productHistoryService;
@Autowired
- private DocLogService logService;
+ private TechnicalSpecificationLockLogService lockLogService;
public Response<Object> excelParse(InputStream inputStream) throws IOException, InvalidFormatException, ParseException {
TechnicalSpecification specification = new TechnicalSpecification();
@@ -167,10 +168,17 @@
specification.setCreateTime(date);
//閿佸畾-璐熻矗浜烘墠鑳借В閿�
specification.setLockFlag(1);
- specification.setLockReason("绯荤粺榛樿閿佸畾,鏂扮増鏈妧鏈鍒欎功涓婁紶");
mapper.insert(specification);
//閿佸畾閫傜敤鏈哄瀷鐨勭敓鏁堢増鏈�
lockOtherByAppliedProduct(specification);
+ //閿佸畾鏃ュ織
+ TechnicalSpecificationLockLog lockLog = new TechnicalSpecificationLockLog();
+ lockLog.setUserName(ActionUtil.getUser().getName());
+ lockLog.setTechnicalSpecificationId(specification.getId());
+ lockLog.setReason("绯荤粺榛樿閿佸畾,鏂扮増鏈妧鏈鍒欎功涓婁紶");
+ lockLog.setCreateTime(date);
+ lockLog.setStatus(0);
+ lockLogService.add(lockLog);
return new Response().set(1,true,"涓婁紶瀹屾垚");
}
@@ -187,7 +195,8 @@
}
@Transactional
- public Response updateLock(int id, int lockFlag) {
+ public Response updateLock(int id, int lockFlag, String reason) {
+ Date date = new Date();
String userName = ActionUtil.getUser().getName();
TechnicalSpecification specificationInDB = get(id);
if(!userName.equals(specificationInDB.getOwner())){
@@ -202,14 +211,28 @@
}else{
//閿佸畾鐩墠鐢熸晥鐗堟湰
availableVersion.setLockFlag(1);
- availableVersion.setLockReason("鏂扮増鏈В閿�,姝ゆ棫鐗堟湰閿佸畾");
mapper.updateById(availableVersion);
+ //閿佸畾鏃ュ織
+ TechnicalSpecificationLockLog lockLog = new TechnicalSpecificationLockLog();
+ lockLog.setUserName(userName);
+ lockLog.setTechnicalSpecificationId(id);
+ lockLog.setReason("鏂扮増鏈В閿�,姝ゆ棫鐗堟湰閿佸畾");
+ lockLog.setCreateTime(date);
+ lockLog.setStatus(0);
+ lockLogService.add(lockLog);
}
}
}
specificationInDB.setLockFlag(lockFlag);
mapper.updateById(specificationInDB);
-
+ //閿佸畾/瑙ｉ攣鏃ュ織
+ TechnicalSpecificationLockLog lockLog = new TechnicalSpecificationLockLog();
+ lockLog.setUserName(userName);
+ lockLog.setTechnicalSpecificationId(id);
+ lockLog.setReason(reason);
+ lockLog.setCreateTime(date);
+ lockLog.setStatus(lockFlag==1?0:1);
+ lockLogService.add(lockLog);
return new Response().set(1, true, "鏇存柊瀹屾垚");
}
--
Gitblit v1.9.1