From c7bc2cdbb75292d9d4d12cf02884f8f140f22009 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 05 七月 2023 12:06:43 +0800
Subject: [PATCH] 更新sop锁定日志
---
src/main/java/com/whyc/service/SOPService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/SOPService.java b/src/main/java/com/whyc/service/SOPService.java
index a230094..defc03d 100644
--- a/src/main/java/com/whyc/service/SOPService.java
+++ b/src/main/java/com/whyc/service/SOPService.java
@@ -322,6 +322,8 @@
@Transactional
public Response add(SOP sop,MultipartFile multipartFile) throws IOException {
//鏄惁瀛樺湪鏃х増鏈�,瀛樺湪鍒欐妸鎵�鏈夋棫鐗堟湰鐘舵�佹洿鏂颁负0
+ String userName = ActionUtil.getUser().getName();
+ Date now = new Date();
QueryWrapper<SOP> query = Wrappers.query();
query.eq("file_name",sop.getFileName()).eq("status",1);
List<SOP> sopListExists = mapper.selectList(query);
@@ -329,13 +331,21 @@
for (SOP sopExists : sopListExists) {
sopExists.setStatus(0);
mapper.updateById(sopExists);
+
+ SOPLockLog lockLog = new SOPLockLog();
+ lockLog.setSopId(sopExists.getId());
+ lockLog.setReason("鏂扮増鏈笂浼�,绯荤粺鑷姩閿佸畾鏃х増鏈�");
+ lockLog.setUserName(userName);
+ lockLog.setCreateTime(now);
+ lockLog.setStatus(0);
+ sopLockLogService.insert(lockLog);
}
}
List<SOPProduct> sopProductList = sop.getSopProductList();
String originalFilename = multipartFile.getOriginalFilename();
String[] fileNameSplit = originalFilename.split("\\.");
- String dateFormat = DateUtil.YYYY_MM_DD_HH_MM_SS_UNION.format(new Date());
+ String dateFormat = DateUtil.YYYY_MM_DD_HH_MM_SS_UNION.format(now);
String newFileName = fileNameSplit[0]+"_"+dateFormat+"."+fileNameSplit[1];
String fileUrlTemp = FileUtil.saveFile(multipartFile,"/sop/"+newFileName);
//String fileUrlTemp = sop.getFileUrl();
@@ -381,7 +391,6 @@
List<String> uploadTypeStrList = typeList.stream().map(type -> type.getType1() + ";" + type.getType2()).collect(Collectors.toList());
List<String> dbTypeStrList = recordListInDB.stream().map(type -> type.getType1() + ";" + type.getType2()).collect(Collectors.toList());
- Date now = new Date();
for (int i = 0; i < uploadTypeStrList.size(); i++) {
String uploadTypeStr = uploadTypeStrList.get(i);
if (!dbTypeStrList.contains(uploadTypeStr)) {
--
Gitblit v1.9.1