From 1a658915f5487f4e996c8a9d6a5d60691a12bc32 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 19 Sep 2024 15:56:31 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/第二阶段.sql | 2 ++ .../EnterpriseStandardPlanController.java | 6 +++--- .../entity/EnterpriseStandardPlan.java | 16 ++++++++++++---- .../entity/vo/EnterpriseStandardPlanVo.java | 10 ++++++++++ 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/db/第二阶段.sql b/db/第二阶段.sql index 727c09e4..ccaca1da 100644 --- a/db/第二阶段.sql +++ b/db/第二阶段.sql @@ -10,7 +10,9 @@ create table laws_enterprise_standard_plan depart_id varchar(50) comment '所在部门id', professional_module varchar(30) comment '专业模块', draft_complete_date datetime comment '初稿完成日期', + draft_complete_flag tinyint default 0 comment '初稿完成标识', plan_archiving_date datetime comment '计划归档日期', + plan_archiving_flag tinyint default 0 comment '计划归档标识', have_english_version varchar(50) comment '是否有英文版', committee varchar(500) comment '所属技术委员会', actual_archiving_date datetime comment '实际归档日期', diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java index 09b3e26d..34614df4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java @@ -73,16 +73,16 @@ public class EnterpriseStandardPlanController extends JeroController deleteEN(@RequestBody IdMapBody map) { if (map.getId() == null || org.apache.commons.lang.StringUtils.isEmpty(map.getId())) { - throw new JeroBootException(MessageUtils.getMessage(ResultCommon.PARAMETERS_CANNOT_BE_NULL)); + throw new JeroBootException(ResultCommon.PARAMETERS_CANNOT_BE_NULL); } String id = map.getId(); EnterpriseStandardPlan esPlan = esPlanService.getById(id); if (esPlan == null) { - throw new JeroBootException(MessageUtils.getMessage(ResultCommon.NO_CORRESPONDING_RECORD_FOUND)); + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_RECORD_FOUND); } else { esPlanService.deleteById(id); } - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + return Result.OK(ResultCommon.OK); } @RequiresPermissions("enterpriseStandardLibrary:plan:export") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java index bf81995c..1097068f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java @@ -1,9 +1,6 @@ package com.jero.modules.laws.enterprise.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; @@ -80,6 +77,11 @@ public class EnterpriseStandardPlan { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date draftCompleteDate; + /** + * 初稿完成标识 + */ + @ApiModelProperty(value = "初稿完成标识") + private Integer draftCompleteFlag; /** * 计划归档日期 */ @@ -87,6 +89,11 @@ public class EnterpriseStandardPlan { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date planArchivingDate; + /** + * 计划归档标识 + */ + @ApiModelProperty(value = "计划归档标识") + private Integer planArchivingFlag; /** * 是否有英文版 */ @@ -150,6 +157,7 @@ public class EnterpriseStandardPlan { /** * 删除状态(0-正常,1-删除) */ + @TableLogic @ApiModelProperty(value = "删除状态(0-正常,1-删除)") private Integer delFlag; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java index f63d8678..71196853 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java @@ -70,6 +70,11 @@ public class EnterpriseStandardPlanVo { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date draftCompleteDate; + /** + * 初稿完成标识 + */ + @ApiModelProperty(value = "初稿完成标识") + private Integer draftCompleteFlag; /** * 计划归档日期 */ @@ -78,6 +83,11 @@ public class EnterpriseStandardPlanVo { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date planArchivingDate; + /** + * 计划归档标识 + */ + @ApiModelProperty(value = "计划归档标识") + private Integer planArchivingFlag; /** * 是否有英文版 */