From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 14 十月 2025 16:34:22 +0800 Subject: [PATCH] 改bug --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java index 0ef1e7f..06d20a5 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java @@ -1,14 +1,17 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.service.business.third.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; +import java.util.List; /** * 闅愭偅鍖哄煙閰嶇疆绫诲瀷淇℃伅琛� @@ -18,7 +21,7 @@ @Data @ApiModel("闅愭偅鍖哄煙閰嶇疆绫诲瀷淇℃伅琛�") @TableName("`hidden_danger_param`") -public class HiddenDangerParam { +public class HiddenDangerParam extends LoginUserModel { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -31,7 +34,6 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -40,7 +42,6 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @@ -69,14 +70,27 @@ @ApiModelProperty(value = "瀹夊叏鍛樼紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1") @ExcelColumn(name="瀹夊叏鍛樼紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑") - private Integer memberIds; + private String memberIds; @ApiModelProperty(value = "瀹夊叏鍛樺鍚嶉泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑") @ExcelColumn(name="瀹夊叏鍛樺鍚嶉泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑") private String memberNames; - @ApiModelProperty(value = "绫诲瀷 0闅愭偅鍖哄煙 1闅愭偅绫诲瀷", example = "1") - @ExcelColumn(name="绫诲瀷 0闅愭偅鍖哄煙 1闅愭偅绫诲瀷") + @ApiModelProperty(value = "绫诲瀷 0闅愭偅鍖哄煙 1闅愭偅绫诲瀷 2妫�鏌ョ被鍨�", example = "1") + @ExcelColumn(name="绫诲瀷 0闅愭偅鍖哄煙 1闅愭偅绫诲瀷 2妫�鏌ョ被鍨�") private Integer type; + @ApiModelProperty(value = "鐢ㄦ埛缂栫爜闆嗗悎", example = "1") + @TableField(exist = false) + private List<Integer> memberIdList; + + + @ApiModelProperty(value = "璐d换閮ㄩ棬缂栫爜锛堝叧鑱攃ompany锛�", example = "1") +// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�") + private Integer companyId; + + @ApiModelProperty(value = "璐d换閮ㄩ棬鍚嶇О", example = "1") +// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�") + @TableField(exist = false) + private String companyName; } -- Gitblit v1.9.3