From 5503a8093cdab15e51644f30df82aed224324797 Mon Sep 17 00:00:00 2001 From: zjh <15615273395@163.com> Date: Tue, 16 Dec 2025 12:37:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98=E5=86=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../self_development/controller/form/UpdateTemplateForm.java | 1 - .../service/impl/BenchmarkingReportServiceImpl.java | 4 ++-- .../self_development/service/impl/ParameterServiceImpl.java | 2 +- .../self_development/service/impl/TemplateServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/xdap/self_development/controller/form/UpdateTemplateForm.java b/src/main/java/com/xdap/self_development/controller/form/UpdateTemplateForm.java index 59dede7..a75eac4 100644 --- a/src/main/java/com/xdap/self_development/controller/form/UpdateTemplateForm.java +++ b/src/main/java/com/xdap/self_development/controller/form/UpdateTemplateForm.java @@ -10,7 +10,6 @@ public class UpdateTemplateForm { @NotBlank(message = "用户不能为空") private String userId; - @NotNull(message = "顺序不能为空") private Integer orderNum; @NotBlank(message = "模板名不能为空") diff --git a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java index cdbd137..11f33fd 100644 --- a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java @@ -123,8 +123,8 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService private String getNodeName(String node) { switch (node) { case "PROOFREAD": return "校对"; - case "REVIEW": return "审核"; - case "APPROVE": return "批准"; + case "REVIEW": return "SE审核"; + case "APPROVE": return "部门长审核"; default: return "-"; } } diff --git a/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java index 7c261ac..c378b19 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java @@ -144,7 +144,7 @@ public class ParameterServiceImpl implements ParameterService { Timestamp.valueOf(LocalDateTime.now()), null, userId, - getMaxOrder() + baseTemplate.getOrderNum() ); bd.getBusinessDatabase().doInsert(newTemplate); return newTemplate; diff --git a/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java index b8ad1ca..8c5b194 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java @@ -78,7 +78,7 @@ public class TemplateServiceImpl implements TemplateService { .doQueryFirst(Template.class); if (template != null) { - if (Objects.equals(form.getTemplateName(), template.getTemplateName())) { + if (Objects.equals(form.getTemplateName(), template.getTemplateName()) && form.getOrderNum() != null) { List originalTemplateId = bd.getBusinessDatabase() .eq("order_num", template.getOrderNum()) .doQuery(Template.class).stream().map(Template::getId)