From c5a0ff2661fe362dddbe88c6a28d19c48c24c39b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 十月 2024 20:39:32 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java |  103 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 82 insertions(+), 21 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
index 71f37dc..a864f48 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
@@ -1,7 +1,10 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.system.model.Multifile;
 import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.system.model.Multifile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,6 +13,7 @@
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 闅愭偅淇℃伅琛�
@@ -23,74 +27,131 @@
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
-    @ExcelColumn(name="涓婚敭")
+//    @ExcelColumn(name="涓婚敭")
     private Integer id;
 
     @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
-    @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+//    @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
     private Integer creator;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-    @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @ExcelColumn(name="鍒涘缓鏃堕棿")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
-    @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+//    @ExcelColumn(name="鏇存柊浜虹紪鐮�")
     private Integer editor;
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
-    @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @ExcelColumn(name="鏇存柊鏃堕棿")
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
-    @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+//    @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
     private Integer isdeleted;
 
     @ApiModelProperty(value = "澶囨敞")
-    @ExcelColumn(name="澶囨敞")
+//    @ExcelColumn(name="澶囨敞")
     private String remark;
 
     @ApiModelProperty(value = "闅愭偅鍖哄煙缂栫爜锛堝叧鑱攈idden_danger_param)", example = "1")
-    @ExcelColumn(name="闅愭偅鍖哄煙缂栫爜锛堝叧鑱攈idden_danger_param)")
+//    @ExcelColumn(name="闅愭偅鍖哄煙缂栫爜锛堝叧鑱攈idden_danger_param)")
     private Integer areaId;
 
     @ApiModelProperty(value = "鐘舵�� 0寰呭鐞� 1宸插鐞� 2涓嶅鐞�", example = "1")
-    @ExcelColumn(name="鐘舵�� 0寰呭鐞� 1宸插鐞� 2涓嶅鐞�")
+    @ExcelColumn(name="澶勭悊缁撴灉" ,valueMapping ="0=0寰呭鐞�;1=宸插鐞�;2=涓嶅鐞�;",index = 6)
     private Integer status;
 
     @ApiModelProperty(value = "鐢宠澶勭悊浜虹紪鐮�(鍏宠仈member)", example = "1")
-    @ExcelColumn(name="鐢宠澶勭悊浜虹紪鐮�(鍏宠仈member)")
+//    @ExcelColumn(name="鐢宠澶勭悊浜虹紪鐮�(鍏宠仈member)")
     private Integer applyCheckUserId;
 
     @ApiModelProperty(value = "闅愭偅绫诲瀷缂栫爜锛堝叧鑱攈idden_danger_param)", example = "1")
-    @ExcelColumn(name="闅愭偅绫诲瀷缂栫爜锛堝叧鑱攈idden_danger_param)")
+//    @ExcelColumn(name="闅愭偅绫诲瀷缂栫爜锛堝叧鑱攈idden_danger_param)")
     private Integer cateId;
 
     @ApiModelProperty(value = "鎯呭喌璇存槑")
-    @ExcelColumn(name="鎯呭喌璇存槑")
+//    @ExcelColumn(name="鎯呭喌璇存槑")
     private String content;
 
     @ApiModelProperty(value = "鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�", example = "1")
-    @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�")
+//    @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�")
     private Integer memberId;
 
     @ApiModelProperty(value = "澶勭悊鏃堕棿")
-    @ExcelColumn(name="澶勭悊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @ExcelColumn(name="澶勭悊鏃堕棿")
     private Date checkDate;
 
     @ApiModelProperty(value = "澶勭悊璇存槑")
-    @ExcelColumn(name="澶勭悊璇存槑")
-    private String checklInfo;
+//    @ExcelColumn(name="澶勭悊璇存槑")
+    private String checkInfo;
 
     @ApiModelProperty(value = "澶勭悊浜虹紪鐮侊紙鍏宠仈member)", example = "1")
-    @ExcelColumn(name="澶勭悊浜虹紪鐮侊紙鍏宠仈member)")
+//    @ExcelColumn(name="澶勭悊浜虹紪鐮侊紙鍏宠仈member)")
     private Integer checkUserId;
 
     @ApiModelProperty(value = "鍖哄煙鍚嶇О")
-    @ExcelColumn(name="鍖哄煙鍚嶇О")
+    @ExcelColumn(name="闅愭偅鍖哄煙",index = 1)
     private String areaName;
 
+    @ApiModelProperty(value = "鐢宠浜哄鍚�", example = "1")
+    @TableField(exist = false)
+    @ExcelColumn(name="鎻愭姤浜哄鍚�",index = 3)
+    private String memberName;
+    @ApiModelProperty(value = "鐢宠浜烘墍灞炵粍缁囧悕绉�", example = "1")
+    @TableField(exist = false)
+    @ExcelColumn(name="鎵�灞炵粍缁�",index = 4)
+    private String companyName;
+    @ApiModelProperty(value = "鐢宠浜烘墜鏈哄彿", example = "1")
+    @TableField(exist = false)
+//    @ExcelColumn(name="鐢宠浜烘墜鏈哄彿")
+    private String memberPhone;
+    @ApiModelProperty(value = "澶勭悊浜哄鍚�", example = "1")
+    @TableField(exist = false)
+//    @ExcelColumn(name="澶勭悊浜哄鍚�")
+    private String checkorName;
+    @ApiModelProperty(value = "澶勭悊浜烘墍灞炵粍缁囧悕绉�", example = "1")
+    @TableField(exist = false)
+//    @ExcelColumn(name="澶勭悊浜烘墍灞炵粍缁囧悕绉�")
+    private String checkorCompanyName;
+    @ApiModelProperty(value = "澶勭悊浜烘墜鏈哄彿", example = "1")
+    @TableField(exist = false)
+//    @ExcelColumn(name="澶勭悊浜烘墜鏈哄彿")
+    private String checkorPhone;
+    @ApiModelProperty(value = "闅愭偅绫诲瀷鍚嶇О", example = "1")
+    @TableField(exist = false)
+    @ExcelColumn(name="闅愭偅绫诲瀷",index = 2)
+    private String categoryName;
+
+    @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂达紙鍩轰簬鎻愭姤鏃堕棿锛�", example = "2024-05-20 11:48:50")
+    @TableField(exist = false)
+    private Date queryStartTime;
+    @ApiModelProperty(value = "鏌ヨ鎴濮嬫椂闂达紙鍩轰簬鎻愭姤鏃堕棿锛�", example = "2024-05-20 11:48:46")
+    @TableField(exist = false)
+    private Date queryEndTime;
+    @ApiModelProperty(value = "鐜板満鎯呭喌鎻愭姤闄勪欢闆嗗悎")
+    @TableField(exist = false)
+    private List<Multifile> submitFileList;
+    @ApiModelProperty(value = "澶勭悊鍓嶉檮浠堕泦鍚�")
+    @TableField(exist = false)
+    private List<Multifile> dealBeforeFileList;
+    @ApiModelProperty(value = "澶勭悊鍚庨檮浠堕泦鍚�")
+    @TableField(exist = false)
+    private List<Multifile> dealAfterFileList;
+
+    @ApiModelProperty(value = "鎻愭姤鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelColumn(name="鎻愭姤鏃堕棿",index = 5)
+    private Date submitTime;
+
+    @ApiModelProperty(value = "澶勭悊鏃堕棿锛堟暣鏀�/閫�鍥炰娇鐢級")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelColumn(name="澶勭悊鏃堕棿",index = 7)
+    private Date dealTime;
+
+    @ApiModelProperty(value = "闄勪欢淇℃伅")
+    @TableField(exist = false)
+    private List<Multifile> multifileList;
+
+
 }

--
Gitblit v1.9.3