From e023474fc9bcc726ed558a0623f1316dddc13152 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 01 十二月 2023 15:14:32 +0800
Subject: [PATCH] 编号

---
 zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java |    8 ++++----
 1 files changed, 4 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 2234b69..23af6e9 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,12 +46,12 @@
     public String getNewCode(Map<String, String> map) {
         SysCodeRule codeRule = baseDao.getCodeRule(map);
         String newCodeTemplet = codeRule.getCodeRule();
+        String year = map.get("year");
         if (map.get("projectId")!=null){
-            String projectIdentity = baseDao.getProjectIdentity(map.get("projectId"));
-            newCodeTemplet = newCodeTemplet.replace("[椤圭洰缂栧彿]",projectIdentity);
+            Map<String, String> mapProject = baseDao.getMapProjectIdentity(map.get("projectId"));
+            newCodeTemplet = newCodeTemplet.replace("[椤圭洰缂栧彿]",mapProject.get("software_identity"));
+            year = mapProject.get("year");
         }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
-        String year = sdf.format(new Date());
         newCodeTemplet = newCodeTemplet.replace("[骞翠唤]",year);
 
         String xhTemplet = StringUtils.substring("__________",0,codeRule.getNoByteNum());

--
Gitblit v1.9.1