jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改：模板逻辑问题再修改

Browse Source
This commit is contained in:
zjh 2025-12-16 12:37:04 +08:00
parent 8a4ddefa01
commit 5503a8093c
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/xdap/self_development/controller/form/UpdateTemplateForm.java
View File

@ -10,7 +10,6 @@ public class UpdateTemplateForm {
@NotBlank(message = "用户不能为空") @NotBlank(message = "用户不能为空")
private String userId; private String userId;
@NotNull(message = "顺序不能为空")
private Integer orderNum; private Integer orderNum;
@NotBlank(message = "模板名不能为空") @NotBlank(message = "模板名不能为空")

4
src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java
View File

@ -123,8 +123,8 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService
private String getNodeName(String node) { private String getNodeName(String node) {
switch (node) { switch (node) {
case "PROOFREAD": return "校对"; case "PROOFREAD": return "校对";
case "REVIEW": return "审核"; case "REVIEW": return "SE审核";
case "APPROVE": return "批准"; case "APPROVE": return "部门长审核";
default: return "-"; default: return "-";
} }
} }

2
src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java
View File

@ -144,7 +144,7 @@ public class ParameterServiceImpl implements ParameterService {
Timestamp.valueOf(LocalDateTime.now()), Timestamp.valueOf(LocalDateTime.now()),
null, null,
userId, userId,
getMaxOrder() baseTemplate.getOrderNum()
); );
bd.getBusinessDatabase().doInsert(newTemplate); bd.getBusinessDatabase().doInsert(newTemplate);
return newTemplate; return newTemplate;

2
src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java
View File

@ -78,7 +78,7 @@ public class TemplateServiceImpl implements TemplateService {
.doQueryFirst(Template.class); .doQueryFirst(Template.class);
if (template != null) { if (template != null) {
if (Objects.equals(form.getTemplateName(), template.getTemplateName())) { if (Objects.equals(form.getTemplateName(), template.getTemplateName()) && form.getOrderNum() != null) {
List<String> originalTemplateId = bd.getBusinessDatabase() List<String> originalTemplateId = bd.getBusinessDatabase()
.eq("order_num", template.getOrderNum()) .eq("order_num", template.getOrderNum())
.doQuery(Template.class).stream().map(Template::getId) .doQuery(Template.class).stream().map(Template::getId)