From fbdc3cb5768e3484648edf3ff96df03c881e78fa Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期四, 16 十一月 2023 09:32:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java b/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java
index c8668e9..2234b69 100644
--- a/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java
+++ b/zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java
@@ -45,7 +45,7 @@
public String getNewCode(Map<String, String> map) {
SysCodeRule codeRule = baseDao.getCodeRule(map);
- String newCodeTemplet = codeRule.getFunCode();
+ String newCodeTemplet = codeRule.getCodeRule();
if (map.get("projectId")!=null){
String projectIdentity = baseDao.getProjectIdentity(map.get("projectId"));
newCodeTemplet = newCodeTemplet.replace("[椤圭洰缂栧彿]",projectIdentity);
@@ -54,15 +54,16 @@
String year = sdf.format(new Date());
newCodeTemplet = newCodeTemplet.replace("[骞翠唤]",year);
- String xhTemplet = StringUtils.substring("__________",0,codeRule.getNoByteNum()-1);
+ String xhTemplet = StringUtils.substring("__________",0,codeRule.getNoByteNum());
newCodeTemplet = newCodeTemplet.replace("[搴忓彿]",xhTemplet);
int xhStartPosition = newCodeTemplet.indexOf(xhTemplet);
String maxCode = baseDao.getMaxCode(codeRule.getTableName(),newCodeTemplet);
String maxCodeXh = "0";
if (StringUtils.isNotBlank(maxCode))
- maxCodeXh = StringUtils.substring(maxCode,xhStartPosition,xhStartPosition+codeRule.getNoByteNum()-1);
- String newCodeXh = String.format("%0"+codeRule.getNoByteNum()+"d", Convert.toInt(maxCodeXh)+1);
+ maxCodeXh = StringUtils.substring(maxCode,xhStartPosition,xhStartPosition+codeRule.getNoByteNum());
+ Integer a = Convert.toInt(maxCodeXh)+1;
+ String newCodeXh = String.format("%0"+codeRule.getNoByteNum()+"d", a);
String newCode = newCodeTemplet.replace(xhTemplet,newCodeXh);
return newCode;
}
--
Gitblit v1.9.1