From d5397923196daf2c54f00e927492261d66e1feb2 Mon Sep 17 00:00:00 2001 From: rk <94314517@qq.com> Date: 星期六, 11 十月 2025 18:19:34 +0800 Subject: [PATCH] 钥匙柜开发 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetLog.java | 55 ++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 38 insertions(+), 17 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetLog.java index 63bd3e6..91d1265 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetLog.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetLog.java @@ -1,5 +1,6 @@ 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; @@ -22,70 +23,90 @@ public class JkCabinetLog extends LoginUserModel { @ApiModelProperty(value = "涓婚敭", example = "1") - @ExcelColumn(name="涓婚敭") @TableId(type = IdType.AUTO) private Integer id; @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1") - @ExcelColumn(name="鍒涘缓浜虹紪鐮�") private Integer creator; @ApiModelProperty(value = "鍒涘缓鏃堕棿") - @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + @ExcelColumn(name="寮�闂ㄦ椂闂�",index = 0,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") - @ExcelColumn(name="鏇存柊浜虹紪鐮�") private Integer editor; @ApiModelProperty(value = "鏇存柊鏃堕棿") - @ExcelColumn(name="鏇存柊鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") - @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�") private Integer isdeleted; @ApiModelProperty(value = "澶囨敞") - @ExcelColumn(name="澶囨敞") private String info; @ApiModelProperty(value = "閽ュ寵鏌滅紪鐮侊紙鍏宠仈jk_cabinet)", example = "1") - @ExcelColumn(name="閽ュ寵鏌滅紪鐮侊紙鍏宠仈jk_cabinet)") private Integer cabinetId; @ApiModelProperty(value = "閽ュ寵鏌滄牸缂栫爜(鍏宠仈jk_cabinet_grid)", example = "1") - @ExcelColumn(name="閽ュ寵鏌滄牸缂栫爜(鍏宠仈jk_cabinet_grid)") private Integer gridId; @ApiModelProperty(value = "楠岃瘉鏂瑰紡 0鍒疯劯 1鍒峰崱", example = "1") - @ExcelColumn(name="楠岃瘉鏂瑰紡 0鍒疯劯 1鍒峰崱") + @ExcelColumn(name="鏍¢獙鏂瑰紡",index = 2,width = 10,valueMapping = "0=浜鸿劯;1=鍒峰崱;2=绠$悊鎺堟潈;") private Integer authType; @ApiModelProperty(value = "杞﹁締缂栫爜锛堝叧鑱攃ars)", example = "1") - @ExcelColumn(name="杞﹁締缂栫爜锛堝叧鑱攃ars)") private Integer carId; @ApiModelProperty(value = "閽ュ寵缂栫爜(鍏宠仈jk_keys)", example = "1") - @ExcelColumn(name="閽ュ寵缂栫爜(鍏宠仈jk_keys)") private Integer keyId; @ApiModelProperty(value = "浜哄憳缂栫爜锛堝叧鑱攎ember)", example = "1") - @ExcelColumn(name="浜哄憳缂栫爜锛堝叧鑱攎ember)") private Integer memberId; @ApiModelProperty(value = "閽ュ寵淇℃伅锛堣溅鐗屽彿-閽ュ寵缂栫爜锛�") - @ExcelColumn(name="閽ュ寵淇℃伅锛堣溅鐗屽彿-閽ュ寵缂栫爜锛�") + @ExcelColumn(name="閽ュ寵",index = 5,width = 16) private String keyInfo; @ApiModelProperty(value = "棰嗗彇瑙勫垯 0闅忚溅 1闅忔淳杞﹀崟", example = "1") - @ExcelColumn(name="棰嗗彇瑙勫垯 0闅忚溅 1闅忔淳杞﹀崟") private Integer roleType; @ApiModelProperty(value = "鐘舵�� 0鎴愬姛 1澶辫触", example = "1") - @ExcelColumn(name="鐘舵�� 0鎴愬姛 1澶辫触") + @ExcelColumn(name="鐘舵��",index = 6,width = 10,valueMapping = "0=鎴愬姛;1=澶辫触;") private Integer status; + @ApiModelProperty(value = "鎿嶄綔绫诲瀷锛�0=寮�闂�;1=鍏抽棬;", example = "1") + private Integer type; + + @ApiModelProperty(value = "鎿嶄綔浜洪儴闂�", example = "1",hidden = true) + @TableField(exist = false) + private String companyName; + + @ApiModelProperty(value = "鎿嶄綔浜哄悕绉�", example = "1") + @ExcelColumn(name="鎿嶄綔浜�",index = 1,width = 2) + @TableField(exist = false) + private String memberName; + + @ApiModelProperty(value = "閽ュ寵鏌滃悕绉�", example = "1") + @ExcelColumn(name="鎵�灞為挜鍖欐煖",index = 3,width = 12) + @TableField(exist = false) + private String cabinetName; + + @ApiModelProperty(value = "鏌滄牸缂栧彿", example = "1") + @ExcelColumn(name="鏌滄牸缂栧彿",index = 4,width = 12) + @TableField(exist = false) + private String gridCode; + + @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂� yyyy-MM-dd ") + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startDate; + + @ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿 yyyy-MM-dd ") + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endDate; + } -- Gitblit v1.9.3