From 30e858fa504b268b9b436afca0a1259cf6e8c488 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 11:01:40 +0800
Subject: [PATCH] 优化
---
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 167 ++++++++++++++++++++++++++++---------------------------
1 files changed, 84 insertions(+), 83 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 a0fd7e4..5de1b32 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
@@ -1,14 +1,15 @@
package com.doumee.dao.business.model;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.doumee.core.annotation.excel.ExcelExportColumn;
+import com.doumee.dao.web.dto.DCANoProblemDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
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;
@@ -24,185 +25,152 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelExportColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelExportColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelExportColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelExportColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelExportColumn(name="鏇存柊鏃堕棿")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelExportColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
- @ApiModelProperty(value = "鎵�灞炲垎绫荤紪锛堝叧鑱攃ategory)")
- @ExcelExportColumn(name="鎵�灞炲垎绫荤紪锛堝叧鑱攃ategory)")
+ @ApiModelProperty(value = "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")
private Integer status;
+ @ApiModelProperty(value = "閭欢閫氱煡鐘舵�� 0寰呴�氱煡 1宸查�氱煡 2閫氱煡澶辫触", example = "1")
+ private Integer emailStatus;
+ @ApiModelProperty(value = "閭欢閫氱煡鏃堕棿", example = "1")
+ private Date emailDate;
+ @ApiModelProperty(value = "閭欢閫氱煡澶囨敞", example = "1")
+ private String emailInfo;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelExportColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "绫诲瀷 0SHE浜嬩欢 1DCA浜嬩欢鎻愪氦璁板綍 2DCA宸ュ崟 3璺岀粖婊戜簨浠�", example = "1")
- @ExcelExportColumn(name="绫诲瀷 0SHE浜嬩欢 1DCA浜嬩欢鎻愪氦璁板綍 2DCA宸ュ崟 3璺岀粖婊戜簨浠�")
private Integer type;
@ApiModelProperty(value = "涓婃姤浜哄憳缂栫爜锛堝叧鑱攎ember)", example = "1")
- @ExcelExportColumn(name="涓婃姤浜哄憳缂栫爜锛堝叧鑱攎ember)")
private Integer memberId;
@ApiModelProperty(value = "閮ㄩ棬缂栫爜", example = "1")
- @ExcelExportColumn(name="閮ㄩ棬缂栫爜")
private Integer companyId;
@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渚涘簲鍟�")
private Integer memberType;
@ApiModelProperty(value = "SHE娑夊強浜哄憳浼佷笟缂栫爜闆嗗悎")
- @ExcelExportColumn(name="SHE娑夊強浜哄憳浼佷笟缂栫爜闆嗗悎")
private String memberQwids;
@ApiModelProperty(value = "SHE娑夊強浜哄憳渚涘簲鍟嗛泦鍚�")
- @ExcelExportColumn(name="SHE娑夊強浜哄憳渚涘簲鍟嗛泦鍚�")
private String memberNames;
@ApiModelProperty(value = "鍙戠敓鍦扮偣/浣嶇疆缂栫爜锛堝叧鑱攃ategory锛�", example = "1")
- @ExcelExportColumn(name="鍙戠敓鍦扮偣/浣嶇疆缂栫爜锛堝叧鑱攃ategory锛�")
private Integer localtionId;
@ApiModelProperty(value = "鏄惁澶栭儴灏卞尰 0鍚� 1鏄�")
- @ExcelExportColumn(name="鏄惁澶栭儴灏卞尰 0鍚� 1鏄�")
private Integer outJiuyi;
@ApiModelProperty(value = "鏄惁鍖诲姟瀹� 0鍚� 1鏄�", example = "1")
- @ExcelExportColumn(name="鏄惁鍖诲姟瀹� 0鍚� 1鏄�")
private Integer isYiwushi;
@ApiModelProperty(value = "鏄惁鍙椾激 0鍚� 1鏄�", example = "1")
- @ExcelExportColumn(name="鏄惁鍙椾激 0鍚� 1鏄�")
private Integer isHurted;
@ApiModelProperty(value = "鏄惁鍜屽伐浣滅浉鍏�", example = "1")
- @ExcelExportColumn(name="鏄惁鍜屽伐浣滅浉鍏�")
private Integer workRelated;
@ApiModelProperty(value = "浜嬩欢璇存槑", example = "1")
- @ExcelExportColumn(name="浜嬩欢璇存槑")
private String eventInfo;
- @ApiModelProperty(value = "閭欢閫氱煡浜哄憳缂栫爜闆嗗悎")
- @ExcelExportColumn(name="閭欢閫氱煡浜哄憳缂栫爜闆嗗悎")
+ @ApiModelProperty(value = "閭欢閫氱煡浜哄憳缂栫爜闆嗗悎 memberId")
private String emialMemberIds;
- @ApiModelProperty(value = "浼佷笟寰俊閫氱煡浜哄憳缂栫爜闆嗗悎")
- @ExcelExportColumn(name="浼佷笟寰俊閫氱煡浜哄憳缂栫爜闆嗗悎")
+ @ApiModelProperty(value = "浼佷笟寰俊閫氱煡浜哄憳缂栫爜闆嗗悎 qwId")
private String qwnoticeMemberIds;
- @ApiModelProperty(value = "鍙戠幇鏃堕棿")
- @ExcelExportColumn(name="鍙戠幇鏃堕棿")
- private String happenTime;
+ @ApiModelProperty(value = "鍙戠敓鏃堕棿")
+ private Date happenTime;
- @ApiModelProperty(value = "椋庨櫓绫诲瀷(鍏宠仈category锛�")
- @ExcelExportColumn(name="椋庨櫓绫诲瀷(鍏宠仈category锛�")
-
- private Date typeId;
+ @ApiModelProperty(value = "椋庨櫓銆佷激瀹炽�佽瀵熶富棰樼被鍨�(鍏宠仈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 = "鍒嗛厤澶囨敞")
- @ExcelExportColumn(name="鍒嗛厤澶囨敞")
private String dispatchInfo;
@ApiModelProperty(value = "澶勭悊鏃堕棿")
- @ExcelExportColumn(name="澶勭悊鏃堕棿")
private Date dealTime;
@ApiModelProperty(value = "澶勭悊澶囨敞")
- @ExcelExportColumn(name="澶勭悊澶囨敞")
private String dealInfo;
@ApiModelProperty(value = "DCA闂鏍囬")
- @ExcelExportColumn(name="DCA闂鏍囬")
private String problemTitle;
@ApiModelProperty(value = "DCA闂缂栫爜(鍏宠仈category锛�", example = "1")
- @ExcelExportColumn(name="DCA闂缂栫爜(鍏宠仈category锛�")
private Integer problemId;
@ApiModelProperty(value = "DCA闂鎻忚堪")
- @ExcelExportColumn(name="DCA闂鎻忚堪")
private String problemInfo;
@ApiModelProperty(value = "浣嶇疆鍦扮偣璺緞鍚嶇О")
- @ExcelExportColumn(name="浣嶇疆鍦扮偣璺緞鍚嶇О")
private String locationName;
@ApiModelProperty(value = "宸ュ崟鍙�")
- @ExcelExportColumn(name="宸ュ崟鍙�")
private String code;
@ApiModelProperty(value = "DCA绗﹀悎鏁伴噺", example = "1")
- @ExcelExportColumn(name="DCA绗﹀悎鏁伴噺")
private Integer dcaYesNum;
@ApiModelProperty(value = "DCA涓嶇鍚堟暟閲�", example = "1")
- @ExcelExportColumn(name="DCA涓嶇鍚堟暟閲�")
private Integer dcaNoNum;
@ApiModelProperty(value = "DCA鎻愪氦璁板綍缂栫爜锛堣嚜鍏宠仈锛�", example = "1")
- @ExcelExportColumn(name="DCA鎻愪氦璁板綍缂栫爜锛堣嚜鍏宠仈锛�")
private Integer dcaRecordId;
@ApiModelProperty(value = "DCA宸ュ崟鎶勯�佷汉鍛樹紒涓氬井淇＄紪鐮侀泦鍚�(澶氫釜鑻辨枃閫楀彿闅斿紑锛�")
- @ExcelExportColumn(name="DCA宸ュ崟鎶勯�佷汉鍛樹紒涓氬井淇＄紪鐮侀泦鍚�(澶氫釜鑻辨枃閫楀彿闅斿紑锛�")
private String dcaCsIds;
+ @ApiModelProperty(value = "涓嬫鍌績鏃堕棿")
+ private Date urgeDate;
+
+ @ApiModelProperty(value = "鍙鐞哠HE浜哄憳浼佸井涓婚敭")
+ private String sheDealUserQwIds;
@ApiModelProperty("闄勪欢淇℃伅")
@TableField(exist = false)
private List<Multifile> multifileList;
+ @ApiModelProperty("鎿嶄綔鍘嗗彶闆嗗悎")
+ @TableField(exist = false)
+ private List<WorkorderLog> logList;
@ApiModelProperty("鎻愭姤浜哄憳鍚嶇О")
@TableField(exist = false)
@@ -216,37 +184,70 @@
@TableField(exist = false)
private String hurtTypeName;
- @ApiModelProperty("鍙戠敓鍦扮偣鍚嶇О")
- @TableField(exist = false)
- private String locationTypeName;
-
@ApiModelProperty("椋庨櫓绫诲瀷鍚嶇О")
@TableField(exist = false)
private String typeName;
-
+ @ApiModelProperty("椋庨櫓绫诲瀷瀹屾暣鍚嶇О")
+ @TableField(exist = false)
+ private String typeNamePath;
+ @ApiModelProperty("浜岀骇涓婚鍚嶇О")
+ @TableField(exist = false)
+ private String categoryName;
@ApiModelProperty("DCA闂鍚嶇О")
@TableField(exist = false)
private String problemName;
-
- @ApiModelProperty("鍚屼簨鍚嶇О 澶氫釜,鍒嗗壊")
- @TableField(exist = false)
- private String colleague;
-
-
- @ApiModelProperty(value = "缁勭粐鍚嶇О")
- @TableField(exist = false)
- private String companyName;
- @ApiModelProperty(value = "涓婃姤浜哄悕绉�")
- @TableField(exist = false)
- private String memberName;
- @ApiModelProperty(value = "涓婃姤浜烘墜鏈哄彿")
+ @ApiModelProperty("鐢ㄦ埛鎵嬫満鍙�")
@TableField(exist = false)
private String memberPhone;
- @ApiModelProperty(value = "绫诲瀷鍚嶇О")
+
+ @ApiModelProperty(value = "鏄惁鍙叧闂寜閽細0=鍚︼紱1=鏄紱", example = "0")
@TableField(exist = false)
- private String typeName;
- @ApiModelProperty(value = "涓婃姤闄勪欢闆嗗悎")
+ private Integer closeButton;
+
+ @ApiModelProperty(value = "鏄惁鍙浆浜ゆ寜閽細0=鍚︼紱1=鏄紱", example = "0")
@TableField(exist = false)
- private Multifile fileList;
+ private Integer passOnButton;
+ @ApiModelProperty(value = "鎴戠殑宸ュ崟:0=鍚︼紱1=鏄紙鏌ヨ浣跨敤锛�", example = "0")
+ @TableField(exist = false)
+ private Integer myWorkOrder;
+ @ApiModelProperty(value = "鍒嗙被缂栫爜璺緞", example = "0")
+ @TableField(exist = false)
+ private String typeIdPath;
+
+ @ApiModelProperty(value = "鎴戠殑宸ュ崟锛堟煡璇娇鐢級",hidden = true)
+ @TableField(exist = false)
+ private String qwId;
+
+ @ApiModelProperty(value = "瑙ｅ喅鎯呭喌锛堟煡璇娇鐢級锛�0=鍚︼紱1=鏄紱",hidden = true)
+ @TableField(exist = false)
+ private Integer dealStatus;
+ @ApiModelProperty(value = "鐘舵�佹弿杩帮紱",hidden = true)
+ @TableField(exist = false)
+ private String statusName;
+ @ApiModelProperty(value = "缁熻鏁帮紱",hidden = true)
+ @TableField(exist = false)
+ private Long num;
+
+ @ApiModelProperty("鏂囦欢璺緞鍓嶇紑")
+ @TableField(exist = false)
+ private String path;
+ @ApiModelProperty("鏃堕棿閫夐」 0鏈懆 1鏈湀 2鏈搴� 3鏈勾")
+ @TableField(exist = false)
+ private Integer timeType;
+
+ @ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�")
+ @TableField(exist = false)
+ private List<DCANoProblemDTO> dcaNoProblemDTOList;
+
+ @ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�(璇︽儏椤碉級")
+ @TableField(exist = false)
+ private List<Workorder> dcaChildList;
+
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date queryStartTime;
+ @ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date queryEndTime;
}
--
Gitblit v1.9.3