From f5ff2c22cb11686b95c1c0c70e8c5098c01a9c99 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 17:36:29 +0800
Subject: [PATCH] 工单业务
---
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 100 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 71 insertions(+), 29 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..8a9d440 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;
/**
* 宸ュ崟淇℃伅琛�
@@ -48,16 +50,16 @@
@ExcelExportColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
- @ApiModelProperty(value = "鎵�灞炲垎绫荤紪锛堝叧鑱攃ategory)")
- @ExcelExportColumn(name="鎵�灞炲垎绫荤紪锛堝叧鑱攃ategory)")
+ @ApiModelProperty(value = "DCA鍒嗙被锛堝叧鑱攃ategory)")
+ @ExcelExportColumn(name="DCA鍒嗙被锛堝叧鑱攃ategory)")
private String categoryId;
@ApiModelProperty(value = "澶囨敞")
@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")
@@ -78,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渚涘簲鍟�")
@@ -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="閭欢閫氱煡浜哄憳缂栫爜闆嗗悎")
@@ -124,30 +126,26 @@
@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="鍒嗛厤鏃堕棿")
-
private Date dispatchTime;
@ApiModelProperty(value = "鍒嗛厤澶囨敞")
@@ -198,20 +196,64 @@
@ExcelExportColumn(name="DCA宸ュ崟鎶勯�佷汉鍛樹紒涓氬井淇＄紪鐮侀泦鍚�(澶氫釜鑻辨枃閫楀彿闅斿紑锛�")
private String dcaCsIds;
- @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @ApiModelProperty(value = "涓嬫鍌績鏃堕棿")
+ @ExcelExportColumn(name="涓嬫鍌績鏃堕棿")
+ private Date urgeDate;
+
+ @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("浜岀骇涓婚鍚嶇О")
@TableField(exist = false)
- private Multifile fileList;
+ private String categoryName;
+ @ApiModelProperty("DCA闂鍚嶇О")
+ @TableField(exist = false)
+ private String problemName;
+ @ApiModelProperty("鐢ㄦ埛鎵嬫満鍙�")
+ @TableField(exist = false)
+ private String memberPhone;
+
+ @ApiModelProperty(value = "鏄惁鍙叧闂寜閽細0=鍚︼紱1=鏄紱", example = "0")
+ @TableField(exist = false)
+ private Integer closeButton;
+
+ @ApiModelProperty(value = "鏄惁鍙浆浜ゆ寜閽細0=鍚︼紱1=鏄紱", example = "0")
+ @TableField(exist = false)
+ private Integer passOnButton;
+
+ @ApiModelProperty(value = "鎴戠殑宸ュ崟:0=鍚︼紱1=鏄紙鏌ヨ浣跨敤锛�", example = "0")
+ @TableField(exist = false)
+ private Integer myWorkOrder;
+
+ @ApiModelProperty(value = "鎴戠殑宸ュ崟锛堟煡璇娇鐢級",hidden = true)
+ @TableField(exist = false)
+ private String qwId;
+
+ @ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�")
+ @TableField(exist = false)
+ private List<DCANoProblemDTO> dcaNoProblemDTOList;
+
+ @ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�(璇︽儏椤碉級")
+ @TableField(exist = false)
+ private List<Workorder> dcaChildList;
}
--
Gitblit v1.9.3