From 3eb6ea1ce6f381cb9545bb4906863f74236152a3 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期一, 20 十月 2025 17:10:33 +0800
Subject: [PATCH] Default Changelist
---
rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
index 9e977d0..d7b494e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
@@ -41,6 +41,7 @@
.getOne(new LambdaQueryWrapper<SerialRule>()
.eq(SerialRule::getCode, code));
if (Objects.isNull(serialRule)) {
+
throw new CoolException("褰撳墠涓氬姟锛�" + code + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
}
SerialRuleItemService serialRuleItemService = SpringUtils.getBean(SerialRuleItemService.class);
@@ -63,9 +64,9 @@
if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_YEAR.type)) {
format = DateUtils.format(new Date(), "yyyy");
} else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_MONTH.type)) {
- format = DateUtils.format(new Date(), "MM");
+ format = DateUtils.format(new Date(), "yyMM");
} else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_DAYS.type)){
- format = DateUtils.format(new Date(), "dd");
+ format = DateUtils.format(new Date(), "yyMMdd");
}
//褰撳墠鍊艰嚜鍔ㄥ姞1
Integer curVal = serialRule.getCurrValue() + 1;
@@ -90,7 +91,6 @@
}
}
});
-
serialRule.setLastCode(buffer.toString());
//淇敼褰撳墠瑙勫垯缂栫爜鍙疯嚦鏁版嵁搴�
if (!ruleService.saveOrUpdate(serialRule)) {
@@ -112,7 +112,7 @@
if (Objects.isNull(start) || end == 0) {
buffer.append(str);
} else {
- if (str.length() <= (end + start)) {
+ if (str.length() < (end + start)) {
throw new CoolException("鎴彇瀛楃璧峰嚭瀛楃涓查暱搴︼紝璇锋煡鐪嬭鍒欒瀹氾紒锛�");
}
//杩斿洖璧峰浣嶇疆lenStr寮�濮嬶紝缁堢偣浣嶇疆涓簂enStr + len闀垮害鐨勫瓧绗︿覆
--
Gitblit v1.9.1