From f116ffb8abf668cdd5a8d33bd2f85363fd1ef28d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 26 六月 2025 16:51:58 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 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 03659a0..9c53c6b 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 @@ -58,7 +58,7 @@ private Integer areaId; @ApiModelProperty(value = "鐘舵�� 0寰呭鐞� 1宸插鐞� 2涓嶅鐞�", example = "1") - @ExcelColumn(name="澶勭悊缁撴灉" ,valueMapping ="0=寰呭鐞�;1=宸插鐞�;2=涓嶅鐞�;",index = 6,width = 6) + @ExcelColumn(name="鏁存敼缁撴灉" ,valueMapping ="0=寰呭鐞�;1=宸插鐞�;2=涓嶅鐞�;",index = 7,width = 6) private Integer status; @ApiModelProperty(value = "鐢宠澶勭悊浜虹紪鐮�(鍏宠仈member)", example = "1") @@ -68,9 +68,11 @@ @ApiModelProperty(value = "闅愭偅绫诲瀷缂栫爜锛堝叧鑱攈idden_danger_param)", example = "1") // @ExcelColumn(name="闅愭偅绫诲瀷缂栫爜锛堝叧鑱攈idden_danger_param)") private Integer cateId; + @ApiModelProperty(value = "闅愭偅妫�鏌ョ被鍨嬬紪鐮侊紙鍏宠仈hidden_danger_param)", example = "1") + private Integer checkTypeId ; @ApiModelProperty(value = "鎯呭喌璇存槑") - @ExcelColumn(name="闂鎻忚堪",index = 3,width = 20) + @ExcelColumn(name="闂鎻忚堪",index = 6,width = 20) private String content; @ApiModelProperty(value = "鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�", example = "1") @@ -90,20 +92,19 @@ private Integer checkUserId; @ApiModelProperty(value = "鍖哄煙鍚嶇О") - @ExcelColumn(name="闅愭偅鍖哄煙",index = 1,width = 10) + @ExcelColumn(name="闅愭偅鍖哄煙",index = 4,width = 10) private String areaName; @ApiModelProperty(value = "鐢宠浜哄鍚�", example = "1") @TableField(exist = false) - @ExcelColumn(name="鎻愭姤浜哄鍚�",index =4,width = 6) + @ExcelColumn(name="鎻愭姤浜哄鍚�",index =9,width = 6) private String memberName; @ApiModelProperty(value = "鐢宠浜烘墍灞炵粍缁囧悕绉�", example = "1") @TableField(exist = false) - @ExcelColumn(name="鎵�灞炵粍缁�",index = 5,width = 15) private String companyName; @ApiModelProperty(value = "璐d换閮ㄩ棬鍚嶇О", example = "1") @TableField(exist = false) - @ExcelColumn(name="璐d换閮ㄩ棬鍚嶇О",index = 0,width = 10) + @ExcelColumn(name="璐d换閮ㄩ棬鍚嶇О",index = 3,width = 10) private String dutyCompanyName; @ApiModelProperty(value = "鐢宠浜烘墜鏈哄彿", example = "1") @@ -124,8 +125,12 @@ private String checkorPhone; @ApiModelProperty(value = "闅愭偅绫诲瀷鍚嶇О", example = "1") @TableField(exist = false) - @ExcelColumn(name="闅愭偅绫诲瀷",index = 2,width = 10) + @ExcelColumn(name="闅愭偅绫诲瀷",index = 5,width = 10) private String categoryName; + @ApiModelProperty(value = "妫�鏌ョ被鍨�", example = "1") + @TableField(exist = false) + @ExcelColumn(name="妫�鏌ョ被鍨�",index = 1,width = 10) + private String checkTypeName; @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂达紙鍩轰簬鎻愭姤鏃堕棿锛�", example = "2024-05-20 11:48:50") @TableField(exist = false) @@ -145,12 +150,12 @@ @ApiModelProperty(value = "鎻愭姤鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ExcelColumn(name="鎻愭姤鏃堕棿",index = 7,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 18) + @ExcelColumn(name="鎻愭姤鏃堕棿",index = 2,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 18) private Date submitTime; @ApiModelProperty(value = "澶勭悊鏃堕棿锛堟暣鏀�/閫�鍥炰娇鐢級") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ExcelColumn(name="澶勭悊鏃堕棿",index = 8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 18) + @ExcelColumn(name="鏁存敼鏃堕棿",index = 7 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 18) private Date dealTime; @ApiModelProperty(value = "闄勪欢淇℃伅") -- Gitblit v1.9.3