From 2e7ba2bc0fbefa6ee0b44eaf1990a493795efe4a Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 16:33:36 +0800
Subject: [PATCH] 导出字段对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
index 0ec5836..79d0248 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.admin.request.OptionsObject;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,11 +12,12 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 璇曢淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("璇曢淇℃伅琛�")
@@ -26,22 +29,27 @@
@ExcelColumn(name="涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
- private String creator;
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @ExcelColumn(name="鍒涘缓浜哄悕绉�")
+ @TableField(exist = false)
+ private String creatorName;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
- private String editor;
+ private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -68,16 +76,19 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnu;
- @ApiModelProperty(value = "绫诲瀷 0鍗曢�� 1澶氶�� ", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍗曢�� 1澶氶�� ")
+ @ApiModelProperty(value = "绫诲瀷 0鍗曢�� 1澶氶�� 2鍒ゆ柇", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鍗曢�� 1澶氶�� 2鍒ゆ柇")
private Integer type;
@ApiModelProperty(value = "鍒嗗��", example = "1")
@ExcelColumn(name="鍒嗗��")
private BigDecimal score;
- @ApiModelProperty(value = "浣跨敤鍦烘櫙 0鍔冲姟浜哄憳 1鏅�氳瀹�", example = "1")
- @ExcelColumn(name="浣跨敤鍦烘櫙 0鍔冲姟浜哄憳 1鏅�氳瀹�")
+ @ApiModelProperty(value = "浣跨敤鍦烘櫙 0璁垮鍜屽姵鍔� 1浠呰瀹� 2浠呭姵鍔�", example = "1")
+ @ExcelColumn(name="浣跨敤鍦烘櫙 浣跨敤鍦烘櫙 0璁垮鍜屽姵鍔� 1浠呰瀹� 2浠呭姵鍔�")
private Integer useType;
+ @ApiModelProperty(value = "閫夐」闆嗗璞￠泦鍚�")
+ @TableField(exist = false)
+ private List<OptionsObject> objectList;
}
--
Gitblit v1.9.3