From 04079d5bac294e58426ef30b9476f7fea746b3da Mon Sep 17 00:00:00 2001 From: xjm Date: Thu, 26 Sep 2024 14:18:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=A1=E5=88=92=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PersonnelPlanController.java | 3 ++- .../project/xyt/model/PersonnelPlan.java | 21 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java index ea91011..8773ff7 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanController.java @@ -173,7 +173,8 @@ public class PersonnelPlanController extends AbstractCommonFileController { List plans = util.importExcel(file.getInputStream()); if (CollectionUtils.isNotEmpty(plans)) { - plans.forEach(o -> o.setId(IdWorker.getId())); + Date regDate = new Date(); + plans.forEach(o -> o.setId(IdWorker.getId()).setRegDate(regDate)); boolean b = service.saveBatch(plans); if (!b) { throw new IllegalArgumentException("上传失败"); diff --git a/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java b/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java index 9bb6f25..6e73a87 100644 --- a/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java +++ b/src/main/java/com/gunshi/project/xyt/model/PersonnelPlan.java @@ -18,6 +18,7 @@ import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; @@ -32,6 +33,7 @@ import java.util.List; */ @EqualsAndHashCode(callSuper = true) @Schema(description="培训计划表") +@Accessors(chain = true) // chain = true 实现链式调用 @Data @TableName("public.personnel_plan") public class PersonnelPlan extends CommUpdate implements Serializable { @@ -61,6 +63,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { * 培训主题分类,0:水利,1:岗前培训,2:在岗培训,3:政治学习教育,4:其他 */ @TableField(value="type") + @Excel(name = "培训主题",sort = 2,readConverterExp = "0=水利,1=岗前培训,2=在岗培训,3=政治学习教育,4=其他") @Schema(description="培训主题分类,0:水利,1:岗前培训,2:在岗培训,3:政治学习教育,4:其他") @NotNull(message = "培训主题不能为空",groups = {Insert.class, Update.class}) @Pattern(regexp = "^[0-4]$", message = "培训主题分类应为：0:水利,1:岗前培训,2:在岗培训,3:政治学习教育,4:其他") @@ -69,7 +72,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 主办单位 */ - @Excel(name = "主办单位",sort = 4) + @Excel(name = "主办单位",sort = 5) @TableField(value="unit") @Schema(description="主办单位") @Size(max = 100,message = "主办单位最大长度要小于 100") @@ -79,7 +82,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 开始培训时间 */ - @Excel(name = "开始培训时间",sort = 2) + @Excel(name = "开始培训时间",sort = 3) @Schema(description="开始培训时间 格式：yyyy-MM-dd") @NotNull(message = "开始培训时间不能为空") @TableField(value="stm") @@ -89,7 +92,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 结束培训时间 */ - @Excel(name = "结束培训时间",sort = 3) + @Excel(name = "结束培训时间",sort = 4) @Schema(description="结束培训时间 格式：yyyy-MM-dd") @NotNull(message = "结束培训时间不能为空") @TableField(value="etm") @@ -99,6 +102,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 培训天数(天) */ + @Excel(name = "培训天数(天)",sort = 9) @Schema(description="培训天数(天)") @TableField(value="day") private Integer day; @@ -106,6 +110,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 培训期数(期) */ + @Excel(name = "培训期数(期)",sort = 8) @Schema(description="培训期数(期)") @TableField(value="num") private Integer num; @@ -113,7 +118,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 培训地点 */ - @Excel(name = "培训地点",sort = 6) + @Excel(name = "培训地点",sort = 7) @Schema(description="培训地点") @TableField(value="addr") @Size(max = 200,message = "主办单位最大长度要小于 200") @@ -123,7 +128,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 培训内容 */ - @Excel(name = "培训内容",sort = 5) + @Excel(name = "培训内容",sort = 6) @Schema(description="培训内容") @TableField(value="content") @Size(max = 500,message = "培训内容最大长度要小于 500") @@ -133,6 +138,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 培训范围 */ + @Excel(name = "培训范围",sort = 10) @Schema(description="培训范围") @TableField(value="scope") @Size(max = 500,message = "培训范围最大长度要小于 500") @@ -142,6 +148,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 参训人员 */ + @Excel(name = "参训人员",sort = 11) @Schema(description="参训人员") @TableField(value="trainees") @Size(max = 200,message = "参训人员最大长度要小于 200") @@ -150,6 +157,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 参训人数(人) */ + @Excel(name = "参训人数(人)",sort = 12) @Schema(description="参训人数(人)") @TableField(value="num_people") @Size(max = 200,message = "参训人员最大长度要小于 200") @@ -159,6 +167,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 联系人 */ + @Excel(name = "联系人",sort = 13) @Schema(description="联系人") @TableField(value="contacts") @Size(max = 50,message = "联系人最大长度要小于 50") @@ -167,6 +176,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { /** * 联系电话 */ + @Excel(name = "联系电话",sort = 14) @Schema(description="联系电话") @TableField(value="contact_number") @Size(max = 30,message = "联系电话最大长度要小于 30") @@ -196,6 +206,7 @@ public class PersonnelPlan extends CommUpdate implements Serializable { */ @Schema(description="登记日期") @TableField(value="reg_date") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD, timezone = "GMT+8") private Date regDate;