update 调整企标计划字段

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 '实际归档日期',

laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java

@@ -73,16 +73,16 @@ public class EnterpriseStandardPlanController extends JeroController<EnterpriseS
     @PostMapping(value = "/delete")
     public Result<T> 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")

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;
 

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;
     /**
      * 是否有英文版
      */