From f1864f6d2d85b49fc901b22e9f6759a5d0fb360b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 26 十一月 2024 09:33:03 +0800 Subject: [PATCH] 开发更新 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRoom.java | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRoom.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRoom.java index f83b8b8..b4bf766 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRoom.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRoom.java @@ -1,6 +1,8 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.core.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -18,7 +20,7 @@ @Data @ApiModel("杩愮淮鍚堝悓鎴挎簮鍏宠仈淇℃伅琛�") @TableName("`yw_contract_room`") -public class YwContractRoom { +public class YwContractRoom extends LoginUserModel { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -55,12 +57,28 @@ @ExcelColumn(name="鎴挎簮缂栫爜锛堝叧鑱攜w_room)") private Integer roomId; - @ApiModelProperty(value = "鍚堝悓缂栫爜锛堝叧鑱攜w_contract)", example = "1") - @ExcelColumn(name="鍚堝悓缂栫爜锛堝叧鑱攜w_contract)") + @ApiModelProperty(value = "鍚堝悓缂栫爜鎴栬处鍗曠紪鐮侊紙鍏宠仈yw_contract)", example = "1") + @ExcelColumn(name="鍚堝悓缂栫爜鎴栬处鍗曠紪鐮侊紙鍏宠仈yw_contract)") private Integer contractId; + + @ApiModelProperty(value = "鍏宠仈绫诲瀷锛�0=鍚堝悓锛�1=鍚堝悓璐﹀崟", example = "1") + @ExcelColumn(name="鍏宠仈绫诲瀷锛�0=鍚堝悓锛�1=鍚堝悓璐﹀崟") + private Integer type; @ApiModelProperty(value = "鎺掑簭鐮�", example = "1") @ExcelColumn(name="鎺掑簭鐮�") private Integer sortnum; + @ApiModelProperty(value = "椤圭洰鍚嶇О") + @TableField(exist = false) + private String projectName; + @ApiModelProperty(value = "妤煎畤鍚嶇О") + @TableField(exist = false) + private String buildingName; + @ApiModelProperty(value = "妤煎眰鍚嶇О") + @TableField(exist = false) + private String floorName; + @ApiModelProperty(value = "鎴块棿鍚嶇О") + @TableField(exist = false) + private String roomName; } -- Gitblit v1.9.3