From 330f39a4e5ac926d6a61dab239bff903dda91fb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 10 四月 2025 11:27:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 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..1d7f413 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;
@@ -57,8 +58,8 @@
@ExcelExportColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 3 宸叉挙鍥� 4宸插鐞�", example = "1")
- @ExcelExportColumn(name="鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 3 宸叉挙鍥� 4宸插鐞�")
+ @ApiModelProperty(value = "鐘舵�� 鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 3SHE鍏抽棴 4WTS鍏抽棴 5宸ョ▼甯堝叧闂�", example = "1")
+ @ExcelExportColumn(name="鐘舵�� 鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 3SHE鍏抽棴 4WTS鍏抽棴 5宸ョ▼甯堝叧闂�")
private Integer status;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@@ -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渚涘簲鍟�")
@@ -125,26 +126,25 @@
@ExcelExportColumn(name="浼佷笟寰俊閫氱煡浜哄憳缂栫爜闆嗗悎")
private String qwnoticeMemberIds;
- @ApiModelProperty(value = "鍙戠幇鏃堕棿")
- @ExcelExportColumn(name="鍙戠幇鏃堕棿")
- private String happenTime;
+ @ApiModelProperty(value = "鍙戠敓鏃堕棿")
+ @ExcelExportColumn(name="鍙戠敓鏃堕棿")
+ private Date 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="褰撳墠鐗╀笟涓荤浼佷笟寰俊缂栫爜")
- private Integer managerId;
+ private String managerId;
@ApiModelProperty(value = "褰撳墠澶勭悊浜哄憳浼佷笟寰俊缂栫爜", example = "1")
@ExcelExportColumn(name="褰撳墠澶勭悊浜哄憳浼佷笟寰俊缂栫爜")
- private Integer dealerId;
+ private String dealerId;
@ApiModelProperty(value = "鍒嗛厤鏃堕棿")
@ExcelExportColumn(name="鍒嗛厤鏃堕棿")
@@ -199,9 +199,16 @@
@ExcelExportColumn(name="DCA宸ュ崟鎶勯�佷汉鍛樹紒涓氬井淇＄紪鐮侀泦鍚�(澶氫釜鑻辨枃閫楀彿闅斿紑锛�")
private String dcaCsIds;
+ @ApiModelProperty(value = "涓嬫鍌績鏃堕棿")
+ @ExcelExportColumn(name="涓嬫鍌績鏃堕棿")
+ private Date urgeDate;
+
@ApiModelProperty("闄勪欢淇℃伅")
@TableField(exist = false)
private List<Multifile> multifileList;
+ @ApiModelProperty("鎿嶄綔鍘嗗彶闆嗗悎")
+ @TableField(exist = false)
+ private List<WorkorderLog> logList;
@ApiModelProperty("鎻愭姤浜哄憳鍚嶇О")
@TableField(exist = false)
@@ -215,26 +222,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