From 001a49a10d39dd6b0d3f6b7e1ad8e691c9664f01 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 22 九月 2023 08:29:45 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/ProductHistoryService.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductHistoryService.java b/src/main/java/com/whyc/service/ProductHistoryService.java
index 2b9e08f..8cd3c23 100644
--- a/src/main/java/com/whyc/service/ProductHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductHistoryService.java
@@ -13,6 +13,7 @@
import com.whyc.pojo.ProductHistory;
import com.whyc.pojo.ProductLockLog;
import com.whyc.util.ActionUtil;
+import com.whyc.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -48,7 +49,26 @@
}
/**鏂板杩藉姞鐨勭増鏈苟灏嗗師鍏堢殑鐗堟湰鐨勫惎鐢ㄨ缃负鏈惎鐢�*/
+ @Transactional
public void insertAndUpdateEnabled(ProductHistory productHistory) {
+ QueryWrapper<ProductHistory> query = Wrappers.query();
+ query.eq("parent_code",productHistory.getParentCode())
+ .eq("custom_code",productHistory.getCustomCode()).eq("enabled",1);
+ ProductHistory productEnabled = mapper.selectOne(query);
+ //娣诲姞鏂板鏃ュ織鍒皌b_product_lock_log琛�
+ ProductLockLog lockLog = new ProductLockLog();
+ lockLog.setParentCode(productEnabled.getParentCode());
+ lockLog.setCustomCode(productEnabled.getCustomCode());
+ lockLog.setVersion(productEnabled.getVersion());
+ lockLog.setVersionTime(DateUtil.YYYY_MM_DD_HH_MM_SS.format(productEnabled.getVersionTime()));
+ lockLog.setReason("浜у搧bom涓婁紶,鍘熺敓鏁堢増鏈攣瀹�");
+ lockLog.setOwner(ActionUtil.getUser().getName());
+ lockLog.setCreateTime(new Date());
+ //1浠ｈ〃鏃ュ織绫诲瀷涓�:閿佸畾
+ lockLog.setLockFlag(1);
+
+ lockLogService.insert(lockLog);
+
UpdateWrapper<ProductHistory> update = Wrappers.update();
update.set("enabled",0).eq("parent_code",productHistory.getParentCode())
.eq("custom_code",productHistory.getCustomCode()).eq("enabled",1);
--
Gitblit v1.9.1