From 9ae471f00bab21ee9cc40efdc26291fb580c03bf Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 08 四月 2025 18:19:08 +0800 Subject: [PATCH] 代码初始化 --- server/src/main/java/com/doumee/dao/business/model/Workorder.java | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/server/src/main/java/com/doumee/dao/business/model/Workorder.java b/server/src/main/java/com/doumee/dao/business/model/Workorder.java index d29f4cf..51fd4c2 100644 --- a/server/src/main/java/com/doumee/dao/business/model/Workorder.java +++ b/server/src/main/java/com/doumee/dao/business/model/Workorder.java @@ -2,13 +2,14 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelExportColumn; +import com.doumee.dao.web.dto.DCANoProblemDTO; 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; @@ -79,7 +80,7 @@ @ApiModelProperty(value = "涓婃姤鏃堕棿", example = "1") @ExcelExportColumn(name="涓婃姤鏃堕棿") - private Integer submitDate; + private Date submitDate; @ApiModelProperty(value = "SHE娑夊強浜哄憳绫诲瀷 0鏈汉 1鍚屼簨 2渚涘簲鍟�", example = "1") @ExcelExportColumn(name="SHE娑夊強浜哄憳绫诲瀷 0鏈汉 1鍚屼簨 2渚涘簲鍟�") @@ -129,14 +130,13 @@ @ExcelExportColumn(name="鍙戠幇鏃堕棿") private String happenTime; - @ApiModelProperty(value = "椋庨櫓绫诲瀷(鍏宠仈category锛�") - @ExcelExportColumn(name="椋庨櫓绫诲瀷(鍏宠仈category锛�") - - private Date typeId; + @ApiModelProperty(value = "椋庨櫓銆佷激瀹炽�佽瀵熶富棰樼被鍨�(鍏宠仈category锛�") + @ExcelExportColumn(name="椋庨櫓銆佷激瀹炽�佽瀵熶富棰樼被鍨�(鍏宠仈category锛�") + private Integer typeId; @ApiModelProperty(value = "椋庨櫓鎻忚堪", example = "1") @ExcelExportColumn(name="椋庨櫓鎻忚堪") - private Integer riskInfo; + private String riskInfo; @ApiModelProperty(value = "褰撳墠鐗╀笟涓荤浼佷笟寰俊缂栫爜", example = "1") @ExcelExportColumn(name="褰撳墠鐗╀笟涓荤浼佷笟寰俊缂栫爜") @@ -202,6 +202,9 @@ @ApiModelProperty("闄勪欢淇℃伅") @TableField(exist = false) private List<Multifile> multifileList; + @ApiModelProperty("鎿嶄綔鍘嗗彶闆嗗悎") + @TableField(exist = false) + private List<WorkorderLog> logList; @ApiModelProperty("鎻愭姤浜哄憳鍚嶇О") @TableField(exist = false) @@ -215,26 +218,23 @@ @TableField(exist = false) private String hurtTypeName; - @ApiModelProperty("鍙戠敓鍦扮偣鍚嶇О") - @TableField(exist = false) - private String locationTypeName; - @ApiModelProperty("椋庨櫓绫诲瀷鍚嶇О") @TableField(exist = false) private String typeName; - @ApiModelProperty("DCA闂鍚嶇О") @TableField(exist = false) private String problemName; - - @ApiModelProperty("鍚屼簨鍚嶇О 澶氫釜,鍒嗗壊") - @TableField(exist = false) - private String colleague; - - - @ApiModelProperty(value = "涓婃姤浜烘墜鏈哄彿") + @ApiModelProperty("鐢ㄦ埛") @TableField(exist = false) private String memberPhone; + + @ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�") + @TableField(exist = false) + private List<DCANoProblemDTO> dcaNoProblemDTOList; + + + + } -- Gitblit v1.9.3