From 1293d3dba10c4e291dfbce4c936f952875557edb Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 18:40:49 +0800
Subject: [PATCH] 配置信息对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 93 +++++++++++++++++++++++++++++++---------------
1 files changed, 63 insertions(+), 30 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
index cf87f9f..9c51476 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@
/**
* 浼佷笟淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("浼佷笟淇℃伅琛�")
@@ -21,29 +22,31 @@
public class Company {
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ApiModelProperty(value = "涓婚敭")
@ExcelColumn(name="涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @TableField(exist = false)
+ private String creatorName;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
- @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@@ -55,31 +58,36 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
@ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
- @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
+ @ApiModelProperty(value = "鎺掑簭鐮�")
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+
+ @ApiModelProperty(value = "鍔冲姟浜烘暟")
+ @TableField(exist = false)
+ private Integer countNum;
@ApiModelProperty(value = "鍥炬爣")
@ExcelColumn(name="鍥炬爣")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐", example = "1")
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
@ExcelColumn(name="绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
private Integer type;
- @ApiModelProperty(value = "鍒嗙被缂栫爜(鍏宠仈category)", example = "1")
+ @ApiModelProperty(value = "鍒嗙被缂栫爜(鍏宠仈category)")
@ExcelColumn(name="鍒嗙被缂栫爜(鍏宠仈category)")
private Integer categoryId;
- @ApiModelProperty(value = "浼佷笟浠ｇ爜", example = "1")
- @ExcelColumn(name="浼佷笟浠ｇ爜")
- private Integer code;
- @ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�", example = "1")
+ @ApiModelProperty(value = "浼佷笟浠ｇ爜")
+ @ExcelColumn(name="浼佷笟浠ｇ爜")
+ private String code;
+
+ @ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
@ExcelColumn(name="涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
private Integer parentId;
@@ -91,52 +99,77 @@
@ExcelColumn(name="鑱旂郴鐢佃瘽")
private String linkPhone;
- @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+ @ApiModelProperty(value = "娴峰悍鏍囪瘑")
@ExcelColumn(name="娴峰悍鏍囪瘑")
- private Integer hkId;
+ private String hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
- @ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
+ @ApiModelProperty(value = "ERP鏍囪瘑")
@ExcelColumn(name="ERP鏍囪瘑")
- private Integer erpId;
+ private String erpId;
+ @ApiModelProperty(value = "ERP鐖剁骇缁勭粐鏍囪瘑")
+ @ExcelColumn(name="ERP鐖剁骇缁勭粐鏍囪瘑")
+ private String erpParentId;
+
+ @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
+ @ExcelColumn(name="璐熻矗浜虹紪鐮�")
+ private String headId;
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date erpDate;
- @ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+ @ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@ExcelColumn(name="ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer erpStatus;
- @ApiModelProperty(value = "閽夐拤鏍囪瘑", example = "1")
+ @ApiModelProperty(value = "閽夐拤鏍囪瘑")
@ExcelColumn(name="閽夐拤鏍囪瘑")
- private Integer ddId;
+ private String ddId;
@ApiModelProperty(value = "閽夐拤鍚屾鏃堕棿")
@ExcelColumn(name="閽夐拤鍚屾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date ddDate;
- @ApiModelProperty(value = "閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+ @ApiModelProperty(value = "閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@ExcelColumn(name="閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer ddStatus;
- @ApiModelProperty(value = "椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+ @ApiModelProperty(value = "椋炰功鏍囪瘑")
+ @ExcelColumn(name="椋炰功鏍囪瘑")
+ private String fsId;
+
+ @ApiModelProperty(value = "椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@ExcelColumn(name="椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer fsStatus;
@ApiModelProperty(value = "椋炰功鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date fsDate;
+ @ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
+ @TableField(exist = false)
+ private String categoryName;
+ @ApiModelProperty(value = "璐熻矗浜哄悕瀛�")
+ @TableField(exist = false)
+ private String headName;
+ @ApiModelProperty(value = "璐熻矗浜烘墜鏈哄彿")
+ @TableField(exist = false)
+ private String headPhone;
+
+ @ApiModelProperty(value = "涓婄骇缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String parentName;
+ @ApiModelProperty(value = "娴峰悍涓婄骇缁勭粐")
+ @TableField(exist = false)
+ private String hkParentId;
+
+
}
--
Gitblit v1.9.3