From 32ab24c8a0406e8e83ca332ef71eda201c6a3ac5 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Fri, 21 Aug 2026 16:43:15 +0800 Subject: [PATCH] PaperBasicInfo --- .../java/org/qinan/cedu/model/dto/ClassManagementDTO.java | 8 ++++---- .../safetyeval/app/support/OrgPersonnelImportRow.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java index 516ec14b..7d84551d 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassManagementDTO.java @@ -42,13 +42,13 @@ public class ClassManagementDTO { private String safetyManager; @ApiModelProperty("培训开始日期") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDateTime startDate; @ApiModelProperty("培训结束日期") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDateTime endDate; @ApiModelProperty("是否开启考试（0-否，1-是）") diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java index 1366a99c..f03190cf 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelImportRow.java @@ -152,11 +152,11 @@ public class OrgPersonnelImportRow { private String officeAddress; @ExcelProperty(value = "是否技术负责人", index = 11) - @Pattern(regexp = "^([是否])?$", message = "是否技术负责人仅允许：是、否") + @Size(max = 2, message = "是否技术负责人长度不能超2个字符") private String technicalDirector; @ExcelProperty(value = "是否过程控制负责人", index = 12) - @Pattern(regexp = "^([是否])?$", message = "是否过程控制负责人仅允许：是、否") + @Size(max = 2, message = "是否过程控制负责人长度不能超2个字符") private String processControlLeader; @ExcelProperty(value = "主要学习工作经历", index = 13)