From 3d4f1501785120195d4a5ab6f4c2e62a7e23573e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 10 十一月 2023 15:36:00 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java | 6 +++++-
zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java | 2 +-
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java | 7 +++----
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 9 ++++++++-
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 8 ++++++++
5 files changed, 25 insertions(+), 7 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 a7e558e..897ab38 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
@@ -14,6 +14,7 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.service.ProjectService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -23,7 +24,9 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -38,6 +41,8 @@
public class ProjectController {
@Autowired
private ProjectService projectService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -70,8 +75,10 @@
public Result insert(@RequestBody Project project){
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(project, AddGroup.class, DefaultGroup.class);
+ Map<String,String> map = new HashMap<>();
+ map.put("funCode","project");
+ 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/SoftwareTestOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
index f509648..04b7896 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
@@ -28,6 +28,9 @@
@ApiModelProperty(value = "鏈烘瀯ID")
private Long agencyId;
+ @ApiModelProperty(value = "濮旀墭鍗曠紪鍙�")
+ private String code;
+
@ApiModelProperty(value = "杩愯鐜")
private String optEnviron;
@@ -133,10 +136,6 @@
@TableField(exist = false)
@ApiModelProperty(value = "杞欢鍚嶇О")
private String softwareName;
-
- @TableField(exist = false)
- @ApiModelProperty(value = "椤圭洰缂栧彿")
- private String code;
@TableField(exist = false)
@ApiModelProperty(value = "椤圭洰鏍囪瘑")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
index 33fe756..bb5e4b0 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
@@ -3,10 +3,14 @@
import com.zt.common.service.BaseService;
import com.zt.life.modules.project.dao.ProjectDao;
import com.zt.life.modules.project.model.Project;
+import com.zt.modules.coderule.service.SysCodeRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -17,7 +21,6 @@
*/
@Service
public class ProjectService extends BaseService<ProjectDao, Project> {
-
/**
* 鍒嗛〉鏌ヨ
*
@@ -37,4 +40,5 @@
super.deleteLogic(ids);
}
+
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index 0d66775..4711f7f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -7,12 +7,15 @@
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -32,6 +35,8 @@
private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
@Autowired
private TestAgencyInfoService testAgencyInfoService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
/**
* 鍒嗛〉鏌ヨ
@@ -59,6 +64,9 @@
if (softwareTestOrderId != null)
baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder());
else {
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "software_test_order");
+ softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId();
}
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..12ff294 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);
--
Gitblit v1.9.1