From 6af6557a8d8a525ec3cab33607b8a041ef0968fa Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 11:15:31 +0800
Subject: [PATCH] 历史导入生成编码时添加前后缀代码逻辑添加；历史导入模板下载时查询模板返回的key不区分大小写。
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
index 73b1f4b..2c098e3 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.omd.service.impl;
import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -34,6 +35,7 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.sql.Wrapper;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -510,7 +512,6 @@
return "";
}
-
/**
* 鏇挎崲鍓嶇紑鍜屽悗缂�
* @param ruleValue 褰撳墠鐗堟湰鐨勫��
@@ -537,7 +538,8 @@
/**
* 鍒嗛〉鏌ヨ
*
- * @param baseQueryObject 鏌ヨ瀵硅薄
+ * @param condition 鏌ヨ瀵硅薄
+ * @param query 鍒嗛〉瀵硅薄
* @return 鏌ヨ缁撴灉
* @throws VciBaseException 鏌ヨ鍑洪敊鏃舵姏鍑哄紓甯�
*/
@@ -557,4 +559,19 @@
VciBaseUtil.alertNotNull(id,"鐗堟湰瑙勫垯鑻辨枃鍚嶇О");
return BtmTypeWrapper.build().listEntityVO(btmTypeMapper.selectList(Wrappers.<BtmType>query().lambda().eq(BtmType::getRevisionRuleId,id)));
}
+
+ /**
+ * 鏍规嵁id鑾峰彇鐗堟湰瑙勫垯
+ * @param id
+ * @return
+ */
+ @Override
+ public RevisionRuleVO getReversionRuleById(String id) {
+ LambdaQueryWrapper<RevisionRule> wrapper = Wrappers.<RevisionRule>query()
+ .lambda().eq(RevisionRule::getId, id)
+ .last("limit 1");
+ RevisionRule revisionRule = baseMapper.selectOne(wrapper);
+ return RevisionRuleWrapper.build().entityVO(revisionRule);
+ }
+
}
--
Gitblit v1.9.3