From a38a1ac77bb6ac9ea8bf0cf5f5f6b68d0e6e6974 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 02 一月 2024 08:44:10 +0800
Subject: [PATCH] 修改
---
zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 23af6e9..d317ee6 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
@@ -46,7 +46,11 @@
public String getNewCode(Map<String, String> map) {
SysCodeRule codeRule = baseDao.getCodeRule(map);
String newCodeTemplet = codeRule.getCodeRule();
- String year = map.get("year");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ String year = sdf.format(new Date());
+ if (map.get("year")!=null){
+ year = map.get("year");
+ }
if (map.get("projectId")!=null){
Map<String, String> mapProject = baseDao.getMapProjectIdentity(map.get("projectId"));
newCodeTemplet = newCodeTemplet.replace("[椤圭洰缂栧彿]",mapProject.get("software_identity"));
@@ -58,7 +62,7 @@
newCodeTemplet = newCodeTemplet.replace("[搴忓彿]",xhTemplet);
int xhStartPosition = newCodeTemplet.indexOf(xhTemplet);
- String maxCode = baseDao.getMaxCode(codeRule.getTableName(),newCodeTemplet);
+ String maxCode = baseDao.getMaxCode(codeRule.getTableName(),codeRule.getCodeFieldName(),newCodeTemplet);
String maxCodeXh = "0";
if (StringUtils.isNotBlank(maxCode))
maxCodeXh = StringUtils.substring(maxCode,xhStartPosition,xhStartPosition+codeRule.getNoByteNum());
--
Gitblit v1.9.1