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/YwProblem.java | 62 +++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProblem.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProblem.java index d6ab8c4..9346c4b 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProblem.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProblem.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.core.model.LoginUserModel; import com.doumee.dao.system.model.Multifile; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -21,7 +22,7 @@ @Data @ApiModel("杩愮淮闂涓婃姤淇℃伅琛�") @TableName("`yw_problem`") -public class YwProblem { +public class YwProblem extends LoginUserModel { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -76,7 +77,6 @@ @ApiModelProperty(value = "鎻愭姤鏃堕棿") @ExcelColumn(name="鎻愭姤鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date submitDate; @ApiModelProperty(value = "缂栧彿") @@ -93,7 +93,7 @@ @ApiModelProperty(value = "澶勭悊鏃堕棿") @ExcelColumn(name="澶勭悊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date dealDate; @ApiModelProperty(value = "澶勭悊澶囨敞") @@ -111,4 +111,60 @@ @ApiModelProperty(value = "闄勪欢淇℃伅") @TableField(exist = false) private List<Multifile> fileList; + + @ApiModelProperty(value = "澶勭悊浜哄悕绉�") + @TableField(exist = false) + private String dealUserName; + + @ApiModelProperty(value = "澶勭悊浜虹粍缁囧悕绉�") + @TableField(exist = false) + private String dealUserCompanyName; + + @ApiModelProperty(value = "澶勭悊寮�濮嬫椂闂� 鏌ヨ浣跨敤") + @TableField(exist = false) + private Date dealDateStart; + + @ApiModelProperty(value = "澶勭悊缁撴潫鏃堕棿 鏌ヨ浣跨敤") + @TableField(exist = false) + private Date dealDateEnd; + + + @ApiModelProperty(value = "淇濅慨鍖哄煙绫诲瀷 0瀹ゅ唴缁翠慨 1鍏叡鍖哄煙", example = "1") + @TableField(exist = false) + private Integer workOrderAreaType; + + @ApiModelProperty(value = "鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)", example = "1") + @TableField(exist = false) + private Integer workOrderRoomId; + + @ApiModelProperty(value = "鎵�灞炴ゼ灞傜紪鐮侊紙鍏宠仈yw_floor)", example = "1") + @TableField(exist = false) + private Integer workOrderFloorId; + + @ApiModelProperty(value = "鎵�灞為」鐩紪鐮�", example = "1") + @TableField(exist = false) + private Integer workOrderProjectId; + + @ApiModelProperty(value = "鎵�灞炴ゼ瀹囩紪鐮�", example = "1") + @TableField(exist = false) + private Integer workOrderBuildId; + + + @ApiModelProperty(value = "宸ュ崟鍒嗙被缂栫爜(鍏宠仈category锛�", example = "1") + @TableField(exist = false) + private Integer workOrderCateId; + + @ApiModelProperty(value = "涓婇棬鏃堕棿") + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date workOrderGetDate; + + @ApiModelProperty(value = "鎯呭喌璇存槑") + @TableField(exist = false) + private String workOrderContent; + + @ApiModelProperty(value = "杞伐鍗曢檮浠朵俊鎭�") + @TableField(exist = false) + private List<Multifile> workOrderFileList; + } -- Gitblit v1.9.3