通报新增修改

ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java

@@ -39,6 +39,38 @@ public class TcTb extends BaseEntity {
     @ApiModelProperty(value = "部门名称")
     private String depName;
 
+
+    /**
+     * 目标ip
+     */
+    @Excel(name = "目标ip")
+    @ApiModelProperty(value = "目标ip")
+    private String  ip;
+
+
+    /**
+     * 处置状态 1:已处置 2:为处置
+     */
+    @Excel(name = "处置状态 1:已处置 2:为处置")
+    @ApiModelProperty(value = "处置状态 1:已处置 2:为处置")
+    private int  state;
+
+
+
+    /**
+     * 文件路径
+     */
+    @Excel(name = "文件路径")
+    @ApiModelProperty(value = "文件路径")
+    private String  fileUrl;
+
+
+    /**
+     * 文件名称
+     */
+    @Excel(name = "文件名称")
+    @ApiModelProperty(value = "文件名称")
+    private String  fileName;
     /**
      * 属地名称
      */
@@ -51,7 +83,7 @@ public class TcTb extends BaseEntity {
      */
     @Excel(name = "通报类型:1.属地通报 2.部门通报")
     @ApiModelProperty(value = "通报类型:1.属地通报 2.部门通报")
-    private Long tbType;
+    private int tbType;
 
     /**
      * 通报时间
@@ -77,35 +109,4 @@ public class TcTb extends BaseEntity {
 
 
 
-    /**
-     * 目标ip
-     */
-    @Excel(name = "目标ip")
-    @ApiModelProperty(value = "目标ip")
-    private String  ip;
-
-
-    /**
-     * 处置状态 1:已处置 2:为处置
-     */
-    @Excel(name = "处置状态 1:已处置 2:为处置")
-    @ApiModelProperty(value = "处置状态 1:已处置 2:为处置")
-    private int  state;
-
-
-
-    /**
-     * 文件路径
-     */
-    @Excel(name = "文件路径")
-    @ApiModelProperty(value = "文件路径")
-    private String  fileUrl;
-
-
-    /**
-     * 文件名称
-     */
-    @Excel(name = "文件名称")
-    @ApiModelProperty(value = "文件名称")
-    private String  fileName;
 }

ruoyi-system/src/main/resources/mapper/zongzhi/TcTbMapper.xml

@@ -58,9 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ip != null">ip,</if>
             <if test="state != null">state,</if>
             <if test="fileUrl != null">file_url,</if>
+            <if test="tbType != null">tb_type,</if>
             <if test="fileName != null">file_name,</if>
             <if test="locationName != null">location_name,</if>
-            <if test="tbType != null">tb_type,</if>
             <if test="tbTime != null">tb_time,</if>
             <if test="createId != null">create_id,</if>
             <if test="createBy != null">create_by,</if>