fix

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/Incident.java

@@ -1,6 +1,7 @@
 package com.ruoyi.zhdd.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -55,6 +56,13 @@ public class Incident implements Serializable {
     private String createDept;
 
     /**
+     * 归档总结
+     */
+    private String conclusion;
+
+    private String conclusionFile;
+
+    /**
      * 上报人
      */
     @TableField(fill = FieldFill.INSERT)

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/Resource.java

@@ -34,6 +34,8 @@ public class Resource implements Serializable {
      */
     private Integer resourceType;
 
+    private String locationType;
+
     /**
      * 名称
      */

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/IncidentBo.java

@@ -113,6 +113,12 @@ public class IncidentBo extends BaseEntity {
     @ApiModelProperty(value = "json拓展，用于存取多出的字段")
     private String exprJson;
 
+    @ApiModelProperty(value = "归档总结")
+    private String conclusion;
+
+    @ApiModelProperty(value = "归档总结附件")
+    private String conclusionFile;
+
     /**
      * 事件标题
      */

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/ResourceBo.java

@@ -39,6 +39,10 @@ public class ResourceBo extends BaseEntity {
     @NotNull(message = "resourceType不能为空", groups = { AddGroup.class })
     private Integer resourceType;
 
+    @ApiModelProperty(value = "位置类型")
+    @NotBlank(message = "locationType不能为空", groups = { AddGroup.class })
+    private String locationType;
+
     /**
      * 名称
      */

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentVo.java

@@ -114,6 +114,12 @@ public class IncidentVo {
 	@ApiModelProperty("json拓展，用于存取多出的字段")
 	private String exprJson;
 
+    @ApiModelProperty(value = "归档总结")
+    private String conclusion;
+
+    @ApiModelProperty(value = "归档总结附件")
+    private String conclusionFile;
+
     /**
      * 事件标题
      */

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/ResourceVo.java

@@ -38,6 +38,9 @@ public class ResourceVo {
 	@ApiModelProperty("资源类型。1-仓库。2-队伍.3-车辆")
 	private Integer resourceType;
 
+    @ApiModelProperty("位置类型")
+    private String locationType;
+
     /**
      * 名称
      */

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentServiceImpl.java

@@ -137,6 +137,9 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
             if (incidentProcessVos.size() == 0) {
                 throw new ServiceException("至少需要一条处置过程！");
             }
+            if (StrUtil.isBlank(bo.getConclusion())) {
+                throw new ServiceException("请填写归档总结！");
+            }
         }
         return updateById(update);
     }

sql/20211209修改.sql

@@ -0,0 +1,20 @@
+alter table b_resource
+    add location_type varchar(10);
+
+comment on column b_resource.location_type is '位置类型（水上和陆上）';
+
+INSERT INTO sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (22, '资源位置类型', 'zhdd_location_type', '0', 'admin', '2021-09-28 15:55:09', 'admin', '2021-09-28 15:55:09', null);
+
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (144, 0, '水上', '水上', 'zhdd_location_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (145, 0, '陆上', '陆上', 'zhdd_location_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
+
+alter table b_incident
+    add conclusion varchar(1000);
+
+comment on column b_incident.conclusion is '归档总结';
+
+alter table b_incident
+    add conclusion_file varchar(3000);
+
+comment on column b_incident.conclusion_file is '归档附件';
+