From 2cef955017c735c2828e69f878d3d6b44200074f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 22 八月 2023 16:54:57 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/dao/business/model/UnqualifiedRecord.java | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/model/UnqualifiedRecord.java b/server/src/main/java/doumeemes/dao/business/model/UnqualifiedRecord.java
index 485712f..32b16ab 100644
--- a/server/src/main/java/doumeemes/dao/business/model/UnqualifiedRecord.java
+++ b/server/src/main/java/doumeemes/dao/business/model/UnqualifiedRecord.java
@@ -1,5 +1,6 @@
package doumeemes.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import doumeemes.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -23,28 +24,23 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 7,width =15)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@@ -53,27 +49,51 @@
private String remark;
@ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�", example = "1")
- @ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
private Integer rootDepartId;
@ApiModelProperty(value = "鍏徃绾х粍缁囩紪鐮侊紙鍏宠仈department琛級", example = "1")
- @ExcelColumn(name="鍏徃绾х粍缁囩紪鐮侊紙鍏宠仈department琛級")
private Integer departId;
@ApiModelProperty(value = "宸ュ崟涓婚敭", example = "1")
- @ExcelColumn(name="宸ュ崟涓婚敭")
private Integer workorderId;
@ApiModelProperty(value = "浜у嚭璁板綍涓婚敭", example = "1")
- @ExcelColumn(name="浜у嚭璁板綍涓婚敭")
private Integer recordId;
@ApiModelProperty(value = "绫诲埆涓婚敭", example = "1")
- @ExcelColumn(name="绫诲埆涓婚敭")
private Integer categoryId;
@ApiModelProperty(value = "妫�楠屼笉鍚堟牸鏁伴噺", example = "1")
- @ExcelColumn(name="妫�楠屼笉鍚堟牸鏁伴噺")
+ @ExcelColumn(name="鏁伴噺",index = 6,width =15)
private BigDecimal unqualifiedNum;
+ @ApiModelProperty(value = "宸ュ崟缂栫爜", example = "1")
+ @ExcelColumn(name="宸ュ崟缂栫爜",index = 1,width =15)
+ @TableField(exist = false)
+ private String workOrderCode;
+
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О", example = "1")
+ @ExcelColumn(name="鐗╂枡鍚嶇О",index = 2,width =15)
+ @TableField(exist = false)
+ private String materialName;
+
+ @ApiModelProperty(value = "鐗╂枡缂栫爜", example = "1")
+ @ExcelColumn(name="鐗╂枡缂栫爜",index = 3,width =15)
+ @TableField(exist = false)
+ private String materialCode;
+
+ @ApiModelProperty(value = "宸ュ簭", example = "1")
+ @ExcelColumn(name="宸ュ簭",index = 4,width =15)
+ @TableField(exist = false)
+ private String proceduresName;
+
+ @ApiModelProperty(value = "涓嶈壇椤�", example = "1")
+ @ExcelColumn(name="涓嶈壇椤�",index = 5,width =15)
+ @TableField(exist = false)
+ private String categoryName;
+
+ @ApiModelProperty(value = "鍒涘缓浜�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜�",index = 8,width =15)
+ @TableField(exist = false)
+ private String createUserName;
}
--
Gitblit v1.9.3