From 8ed17ae9bfe70c1c94ffd44148e32b914c8bec8d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 15:40:36 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 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 610f93d..684f6ba 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
@@ -27,94 +27,104 @@
@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="鍒涘缓鏃堕棿")
+// @ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+// @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
+// @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 = 5)
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="璐ｄ换閮ㄩ棬鍚嶇О",index = 0)
+ private String dutyCompanyName;
@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")
@@ -135,8 +145,13 @@
@ApiModelProperty(value = "鎻愭姤鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="鎻愭姤鏃堕棿",index = 6,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date submitTime;
+ @ApiModelProperty(value = "澶勭悊鏃堕棿锛堟暣鏀�/閫�鍥炰娇鐢級")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="澶勭悊鏃堕棿",index = 7 ,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date dealTime;
@ApiModelProperty(value = "闄勪欢淇℃伅")
@TableField(exist = false)
--
Gitblit v1.9.3