From ff087240b3dee29ce4e14ad0836e76b9fdf312cf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/lianhelihua_sh
---
server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java
index 53ffd98..5571e59 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaChildDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.apache.ibatis.logging.nologging.NoLoggingImpl;
+import org.apache.ibatis.logging.slf4j.Slf4jImpl;
import java.util.Date;
@@ -32,19 +34,23 @@
@ExcelColumn(name="涓嶇鍚堥」",index =5,width = 10)
private String problemTitle;
@ApiModelProperty(value = "鐘舵�� 鐘舵�� 0寰呯‘璁�/寰呭垵瀹� 1寰呭垎閰�/寰呯粓瀹� 2寰呭鐞� 4WTS鍏抽棴 5宸ョ▼甯堝叧闂�", example = "1")
- @ExcelColumn(name="鐘舵��",index =6,width = 4, valueMapping = "0=寰呭鐞�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
+ @ExcelColumn(name="鐘舵��",index =6,width = 4, valueMapping = "0=澶勭悊涓�;1=澶勭悊涓�;2=澶勭悊涓�;3=宸插鐞�;4=宸插鐞�;5=宸插鐞�;")
private Integer status;
+ @ApiModelProperty(value = "鐘舵�佹弿杩�")
+ @ExcelColumn(name="鐘舵�佹弿杩�",index =7,width = 8)
+ private String statusName;
@ApiModelProperty(value = "涓婃姤鏃堕棿", example = "1")
- @ExcelColumn(name="涓婃姤鏃堕棿",index =7 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ @ExcelColumn(name="涓婃姤鏃堕棿",index =8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date submitDate;
@ApiModelProperty(value = "鍙戠幇鏃堕棿", example = "1")
- @ExcelColumn(name="鍙戠幇鏃堕棿",index =8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ @ExcelColumn(name="鍙戠幇鏃堕棿",index =9 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date happenTime;
@ApiModelProperty(value = "浣嶇疆", example = "1")
- @ExcelColumn(name="浣嶇疆",index =9 ,width = 6)
+ @ExcelColumn(name="浣嶇疆",index =10 ,width = 6)
private String locationName;
+
@ApiModelProperty(value = "涓嶇鍚堝師鍥�", example = "1")
- @ExcelColumn(name="涓嶇鍚堝師鍥�",index =10,width = 10)
+ @ExcelColumn(name="涓嶇鍚堝師鍥�",index =11,width = 10)
private String eventInfo;
@ApiModelProperty("鎻愭姤浜哄憳鍚嶇О")
@ExcelColumn(name="涓婃姤鍛樺伐",index =12,width = 8)
--
Gitblit v1.9.3