From 078a5c4ced367fdbd5a16c27c8bada6e44e632d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 09 十月 2025 16:00:33 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java | 68 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java
index 59b7ae3..9a7f912 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.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 com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -23,69 +24,90 @@
public class JkCustomer extends LoginUserModel {
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
+ //@ExcelColumn(name="涓婚敭")
+ @TableId(type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ //@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@ExcelColumn(name="鍒涘缓鏃堕棿")IMPORTING_JKCUSTOMER
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ //@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@ExcelColumn(name="鏇存柊鏃堕棿")IMPORTING_JKCUSTOMER
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ //@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ //@ExcelColumn(name="澶囨敞")
private String info;
@ApiModelProperty(value = "鍚嶇О", example = "1")
- @ExcelColumn(name="鍚嶇О")
- private Integer name;
+ @ExcelColumn(name="瀹㈡埛鍚嶇О",index = 2,width = 10)
+ private String name;
@ApiModelProperty(value = "缂栫爜", example = "1")
- @ExcelColumn(name="缂栫爜")
- private Integer code;
+ @ExcelColumn(name="瀹㈡埛绠�鐮�",index = 1,width = 10)
+ private String code;
@ApiModelProperty(value = "鎵�鍦ㄤ綅缃�")
- @ExcelColumn(name="鎵�鍦ㄤ綅缃�")
- private String lacation;
+ @ExcelColumn(name="鍦板潃",index = 3,width = 10)
+ private String location;
@ApiModelProperty(value = "缁忓害", example = "1")
- @ExcelColumn(name="缁忓害")
+ //@ExcelColumn(name="缁忓害")
private BigDecimal longitude;
@ApiModelProperty(value = "缁村害", example = "1")
- @ExcelColumn(name="缁村害")
+ //@ExcelColumn(name="缁村害")
private BigDecimal latitude;
- @ApiModelProperty(value = "閰嶉�佸懆鏈�")
- @ExcelColumn(name="閰嶉�佸懆鏈�")
- private String weeks;
+ @ApiModelProperty(value = "瀹㈡埛搴忓彿")
+ @ExcelColumn(name="搴忓彿",index = 8,width = 10)
+ private String sortno;
+ @ApiModelProperty(value = "缁忕含搴�", example = "1")
+ @ExcelColumn(name="缁忕含搴�",index = 3,width = 10)
+ @TableField(exist = false)
+ private String locationInfo;
@ApiModelProperty(value = "閫佽揣璺嚎缂栫爜锛堝叧鑱攋k_line)", example = "1")
- @ExcelColumn(name="閫佽揣璺嚎缂栫爜锛堝叧鑱攋k_line)")
+ //@ExcelColumn(name="閫佽揣璺嚎缂栫爜锛堝叧鑱攋k_line)")
private Integer lineId;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 绂佺敤", example = "1")
- @ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
private Integer status;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelColumn(name="鎺掑簭鐮�")
+ //@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+ @ApiModelProperty(value = "鎵�灞炰富绾胯矾", example = "1")
+ @ExcelColumn(name="鎵�灞炰富绾胯矾",index = 7,width = 10)
+ @TableField(exist = false)
+ private String categoryName;
+ @ApiModelProperty(value = "鎵�灞炰富绾胯矾缂栫爜", example = "1")
+ @TableField(exist = false)
+ private Integer categoryId;
+ @ApiModelProperty(value = "绾胯矾", example = "1")
+ @ExcelColumn(name="閫佽揣绾胯矾",index = 6,width = 10)
+ @TableField(exist = false)
+ private String lineName;
+ @ApiModelProperty(value = "閰嶉�佸懆鏈�", example = "1")
+ @ExcelColumn(name="閰嶉�佸懆鏈�",index = 5,width = 10)
+ @TableField(exist = false)
+ private String lineWeeks;
+ @ApiModelProperty(value = "鏄惁鏂板锛� 0鍚� 1鏄�", example = "1")
+ @TableField(exist = false)
+ private int isnew;
}
--
Gitblit v1.9.3