Commit f2bf67b4 authored by 韩桐桐's avatar 韩桐桐

fix(jg): 补充merge丢失代码

parent c7c6c75c
......@@ -3325,8 +3325,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 使用登记证编号判断是否使用未来系统生成编号
String key = useRegistrationCode.length() >= 5 ? useRegistrationCode.substring(0, 5) : useRegistrationCode;
List<String> prefixes = Collections.unmodifiableList(Arrays.asList("容", "锅", "管", "瓶", "梯", "起", "索", "游", "车"));
if (useRegistrationCode.length() == 14 && prefixes.stream().anyMatch(key::startsWith)) {
String prefix = useRegistrationCode.substring(0, 3);
if (useRegistrationCode.length() == 14 && prefixes.stream().anyMatch(key::startsWith) && !"容3T".equals(prefix)) {
// 如果 prefix 不等于 "瓶31" 或 "瓶32" 则继续执行逻辑
ValueOperations<String, String> valueOps = redisTemplate.opsForValue();
String currentSequenceStr = valueOps.get(key);
......@@ -3338,7 +3338,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
int extractedYear = Integer.parseInt(extractedYearStr);
if (currentYearLastTwoDigits == extractedYear) {
if (redisUtils.hasKey(useRegistrationCode.substring(0, 5))) {
String prefix = useRegistrationCode.substring(0, 3);
// 检查regType是否为Cylinder,如果是,才执行"瓶31" 和 "瓶32" 的条件判断
if (!"cylinder".equals(regType) || Stream.of("瓶31", "瓶32").noneMatch(prefix::equals)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment