From ef358a8d86e3f29f6924ebc572d97525f6f023d2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 四月 2025 18:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 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 782b3b4..7afb179 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,14 +2,16 @@
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;
/**
* 宸ュ崟淇℃伅琛�
@@ -98,7 +100,7 @@
@ApiModelProperty(value = "鏄惁澶栭儴灏卞尰 0鍚� 1鏄�")
@ExcelExportColumn(name="鏄惁澶栭儴灏卞尰 0鍚� 1鏄�")
- private String outJiuyi;
+ private Integer outJiuyi;
@ApiModelProperty(value = "鏄惁鍖诲姟瀹� 0鍚� 1鏄�", example = "1")
@ExcelExportColumn(name="鏄惁鍖诲姟瀹� 0鍚� 1鏄�")
@@ -114,7 +116,7 @@
@ApiModelProperty(value = "浜嬩欢璇存槑", example = "1")
@ExcelExportColumn(name="浜嬩欢璇存槑")
- private Integer eventInfo;
+ private String eventInfo;
@ApiModelProperty(value = "閭欢閫氱煡浜哄憳缂栫爜闆嗗悎")
@ExcelExportColumn(name="閭欢閫氱煡浜哄憳缂栫爜闆嗗悎")
@@ -128,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="褰撳墠鐗╀笟涓荤浼佷笟寰俊缂栫爜")
@@ -198,20 +199,42 @@
@ExcelExportColumn(name="DCA宸ュ崟鎶勯�佷汉鍛樹紒涓氬井淇＄紪鐮侀泦鍚�(澶氫釜鑻辨枃閫楀彿闅斿紑锛�")
private String dcaCsIds;
- @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @ApiModelProperty("闄勪欢淇℃伅")
@TableField(exist = false)
- private String companyName;
- @ApiModelProperty(value = "涓婃姤浜哄悕绉�")
+ private List<Multifile> multifileList;
+ @ApiModelProperty("鎿嶄綔鍘嗗彶闆嗗悎")
+ @TableField(exist = false)
+ private List<WorkorderLog> logList;
+
+ @ApiModelProperty("鎻愭姤浜哄憳鍚嶇О")
@TableField(exist = false)
private String memberName;
- @ApiModelProperty(value = "涓婃姤浜烘墜鏈哄彿")
+
+ @ApiModelProperty("鎻愭姤浜哄憳鎵�灞為儴闂�")
@TableField(exist = false)
- private String memberPhone;
- @ApiModelProperty(value = "绫诲瀷鍚嶇О")
+ private String companyName;
+
+ @ApiModelProperty("鍙椾激绫诲埆鍚嶇О")
+ @TableField(exist = false)
+ private String hurtTypeName;
+
+ @ApiModelProperty("椋庨櫓绫诲瀷鍚嶇О")
@TableField(exist = false)
private String typeName;
- @ApiModelProperty(value = "涓婃姤闄勪欢闆嗗悎")
+ @ApiModelProperty("DCA闂鍚嶇О")
@TableField(exist = false)
- private Multifile fileList;
+ private String problemName;
+ @ApiModelProperty("鐢ㄦ埛")
+ @TableField(exist = false)
+ private String memberPhone;
+
+
+
+ @ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�")
+ @TableField(exist = false)
+ private List<DCANoProblemDTO> dcaNoProblemDTOList;
+
+
+
}
--
Gitblit v1.9.3