From ed6f8262c6e511edd72f87c667b70eb35b01c6f2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 09 十二月 2024 12:39:27 +0800
Subject: [PATCH] update 优化 代码生成 创建更新时间被覆盖问题
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java
index d69f6ec..b2ffb9e 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java
@@ -1,5 +1,6 @@
package org.dromara.workflow.service.impl;
+import cn.hutool.core.collection.CollUtil;
import org.dromara.common.core.utils.MapstructUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
@@ -35,6 +36,49 @@
}
/**
+ * 鏌ヨ娴佺▼瀹氫箟閰嶇疆
+ *
+ * @param tableName 琛ㄥ悕
+ * @return 缁撴灉
+ */
+ @Override
+ public WfDefinitionConfigVo getByTableNameLastVersion(String tableName) {
+ List<WfDefinitionConfigVo> wfDefinitionConfigVos = baseMapper.selectVoList(
+ new LambdaQueryWrapper<WfDefinitionConfig>().eq(WfDefinitionConfig::getTableName, tableName).orderByDesc(WfDefinitionConfig::getVersion));
+ if (CollUtil.isNotEmpty(wfDefinitionConfigVos)) {
+ return wfDefinitionConfigVos.get(0);
+ }
+ return null;
+ }
+
+ /**
+ * 鏌ヨ娴佺▼瀹氫箟閰嶇疆
+ *
+ * @param definitionId 娴佺▼瀹氫箟id
+ * @param tableName 琛ㄥ悕
+ * @return 缁撴灉
+ */
+ @Override
+ public WfDefinitionConfigVo getByDefIdAndTableName(String definitionId, String tableName) {
+ return baseMapper.selectVoOne(new LambdaQueryWrapper<WfDefinitionConfig>()
+ .eq(WfDefinitionConfig::getDefinitionId, definitionId)
+ .eq(WfDefinitionConfig::getTableName, tableName));
+ }
+
+ /**
+ * 鏌ヨ娴佺▼瀹氫箟閰嶇疆鎺掗櫎褰撳墠鏌ヨ鐨勬祦绋嬪畾涔�
+ *
+ * @param tableName 琛ㄥ悕
+ * @param definitionId 娴佺▼瀹氫箟id
+ */
+ @Override
+ public List<WfDefinitionConfigVo> getByTableNameNotDefId(String tableName, String definitionId) {
+ return baseMapper.selectVoList(new LambdaQueryWrapper<WfDefinitionConfig>()
+ .eq(WfDefinitionConfig::getTableName, tableName)
+ .ne(WfDefinitionConfig::getDefinitionId, definitionId));
+ }
+
+ /**
* 鏌ヨ娴佺▼瀹氫箟閰嶇疆鍒楄〃
*/
@Override
@@ -49,8 +93,10 @@
@Transactional(rollbackFor = Exception.class)
public Boolean saveOrUpdate(WfDefinitionConfigBo bo) {
WfDefinitionConfig add = MapstructUtils.convert(bo, WfDefinitionConfig.class);
+ baseMapper.delete(new LambdaQueryWrapper<WfDefinitionConfig>().eq(WfDefinitionConfig::getTableName, bo.getTableName()));
+ add.setTableName(add.getTableName().toLowerCase());
boolean flag = baseMapper.insertOrUpdate(add);
- if (baseMapper.insertOrUpdate(add)) {
+ if (flag) {
bo.setId(add.getId());
}
return flag;
@@ -61,7 +107,7 @@
*/
@Override
public Boolean deleteByIds(Collection<Long> ids) {
- return baseMapper.deleteBatchIds(ids) > 0;
+ return baseMapper.deleteByIds(ids) > 0;
}
@Override
--
Gitblit v1.9.3