From 57b27380a1dd02d990fb7e9d8db5b8fe8938ff91 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 20 十一月 2023 10:26:32 +0800
Subject: [PATCH] 编号
---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java | 3 +++
zt/core/src/main/java/com/zt/modules/coderule/dao/SysCodeRuleDao.java | 4 ++++
zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java | 9 ++++-----
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 6 ++++++
zt/core/src/main/resources/mapper/coderule/SysCodeRuleDao.xml | 6 ++++++
5 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
index e40f891..c626323 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
@@ -24,6 +24,8 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -76,8 +78,12 @@
public Result insert(@RequestBody Project project) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(project, AddGroup.class, DefaultGroup.class);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ String year = sdf.format(new Date());
Map<String, String> map = new HashMap<>();
map.put("funCode", "project");
+ map.put("year",year);
+ project.setYear(year);
project.setCode(sysCodeRuleService.getNewCode(map));
projectService.insert(project);
return Result.ok();
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
index 1fcbcf6..788e9ac 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
@@ -51,6 +51,9 @@
@ApiModelProperty(value = "椤圭洰缂栧彿")
private String code;
+ @ApiModelProperty(value = "骞翠唤")
+ private String year;
+
@ApiModelProperty(value = "杞欢鏍囪瘑")
private String softwareIdentity;
diff --git a/zt/core/src/main/java/com/zt/modules/coderule/dao/SysCodeRuleDao.java b/zt/core/src/main/java/com/zt/modules/coderule/dao/SysCodeRuleDao.java
index 327b316..e4e0472 100644
--- a/zt/core/src/main/java/com/zt/modules/coderule/dao/SysCodeRuleDao.java
+++ b/zt/core/src/main/java/com/zt/modules/coderule/dao/SysCodeRuleDao.java
@@ -25,4 +25,8 @@
String getProjectIdentity(String projectId);
String getMaxCode(String tableName, String newCodeTemplet);
+
+ String getProjectYear(Map<String, String> map);
+
+ Map<String, String> getMapProjectIdentity(String projectId);
}
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..9cfb50d 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,14 +46,13 @@
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("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());
newCodeTemplet = newCodeTemplet.replace("[搴忓彿]",xhTemplet);
int xhStartPosition = newCodeTemplet.indexOf(xhTemplet);
diff --git a/zt/core/src/main/resources/mapper/coderule/SysCodeRuleDao.xml b/zt/core/src/main/resources/mapper/coderule/SysCodeRuleDao.xml
index ee2f579..6c7ed18 100644
--- a/zt/core/src/main/resources/mapper/coderule/SysCodeRuleDao.xml
+++ b/zt/core/src/main/resources/mapper/coderule/SysCodeRuleDao.xml
@@ -25,6 +25,12 @@
<select id="getMaxCode" resultType="java.lang.String">
select max(code) from ${tableName} where code like '${newCodeTemplet}'
</select>
+ <select id="getProjectYear" resultType="java.lang.String">
+
+ </select>
+ <select id="getMapProjectIdentity" resultType="java.util.Map">
+ select identity,year from project where id = ${projectId}
+ </select>
</mapper>
--
Gitblit v1.9.1