From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 06 六月 2025 19:19:34 +0800 Subject: [PATCH] 开发更新 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java index 52b009b..f2c95f8 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java @@ -33,6 +33,7 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ExcelColumn(name="涓婃姤鏃堕棿",index = 5,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -72,6 +73,7 @@ @ApiModelProperty(value = "鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)", example = "1") private Integer roomId; + @ApiModelProperty(value = "鎵�灞炴ゼ灞傜紪鐮侊紙鍏宠仈yw_floor)", example = "1") private Integer floorId; @@ -83,7 +85,6 @@ @ApiModelProperty(value = "鎻愭姤鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ExcelColumn(name="涓婃姤鏃堕棿",index = 5,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss") private Date submitDate; @ApiModelProperty(value = "宸ュ崟鍒嗙被缂栫爜(鍏宠仈category锛�", example = "1") @@ -97,7 +98,7 @@ private String code; @ApiModelProperty(value = "澶勭悊鐘舵�� 0寰呭鐞� 1宸插垎娲� 2宸插鐞�", example = "1") - @ExcelColumn(name="宸ュ崟鐘舵��",index = 7,width = 10,valueMapping = "0=寰呭鐞�;1=宸插垎娲�;1=宸插鐞�;") + @ExcelColumn(name="宸ュ崟鐘舵��",index = 7,width = 10,valueMapping = "0=寰呮寚娲�;1=宸叉寚娲�;2=宸插鐞�;") private Integer dealStatus; @ApiModelProperty(value = "鍒嗘淳浜虹紪鐮�(鍏宠仈system_user)", example = "1") @@ -123,6 +124,10 @@ @ApiModelProperty(value = "澶勭悊鏂瑰紡 0鎸囨淳鍚庡鐞� 1鐩存帴鍥炲", example = "1") private Integer dealType; + + @ApiModelProperty(value = "鏉ユ簮 0鑷缓 1闂杞伐鍗�", example = "1") + private Integer origin; + @ApiModelProperty(value = "椤圭洰鍚嶇О") @TableField(exist = false) private String projectName; @@ -136,9 +141,15 @@ @TableField(exist = false) private String buildingName; @ApiModelProperty(value = "鎴挎簮鍚嶇О") - @ExcelColumn(name="鎴挎簮",index = 2,width = 10) @TableField(exist = false) private String roomName; + @ApiModelProperty(value = "闂涓婚敭") + @TableField(exist = false) + private String problemId; + @ApiModelProperty(value = "鎶ヤ慨鍖哄煙") + @ExcelColumn(name="鎶ヤ慨鍖哄煙",index = 2,width = 10) + @TableField(exist = false) + private String areaNameInfo; @ApiModelProperty(value = "妤煎眰鍚嶇О") @TableField(exist = false) private String floorName; @@ -163,6 +174,9 @@ @ExcelColumn(name="宸ュ崟鍒嗙被",index = 3,width = 10) @TableField(exist = false) private String categoryName; + @ApiModelProperty(value = "宸ュ崟鐖剁骇鍒嗙被") + @TableField(exist = false) + private String categoryParentName; @ApiModelProperty(value = "鍒嗛厤浜哄鍚�") @TableField(exist = false) private String dispatchUserName; -- Gitblit v1.9.3