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/JkSketchCustomer.java |   63 +++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java
index bb7eac3..b30a3f9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.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.service.business.third.model.LoginUserModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -8,6 +10,8 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -18,61 +22,86 @@
 @Data
 @ApiModel("浜ゆ帶-绾胯矾浼樺寲绾胯矾瀹㈡埛璁板綍淇℃伅琛�")
 @TableName("`jk_sketch_customer`")
-public class JkSketchCustomer {
+public class JkSketchCustomer  extends LoginUserModel {
 
     @ApiModelProperty(value = "涓婚敭", example = "1")
-    @ExcelColumn(name="涓婚敭")
+    @TableId(type = IdType.AUTO)
+    //@ExcelColumn(name="涓婚敭")
     private Integer id;
 
     @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
-    @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+    //@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
     private Integer creator;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-    @ExcelColumn(name="鍒涘缓鏃堕棿")
+    //@ExcelColumn(name="鍒涘缓鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
-    @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+    //@ExcelColumn(name="鏇存柊浜虹紪鐮�")
     private Integer editor;
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
-    @ExcelColumn(name="鏇存柊鏃堕棿")
+    //@ExcelColumn(name="鏇存柊鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     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 = "绾胯矾缂栫爜锛堝叧鑱攋k_sketch_line)", example = "1")
-    @ExcelColumn(name="绾胯矾缂栫爜锛堝叧鑱攋k_sketch_line)")
+    //@ExcelColumn(name="绾胯矾缂栫爜锛堝叧鑱攋k_sketch_line)")
     private Integer sketchLineId;
 
     @ApiModelProperty(value = "绾胯矾浼樺寲缂栫爜锛堝叧鑱攋k_sketch)", example = "1")
-    @ExcelColumn(name="绾胯矾浼樺寲缂栫爜锛堝叧鑱攋k_sketch)")
+    //@ExcelColumn(name="绾胯矾浼樺寲缂栫爜锛堝叧鑱攋k_sketch)")
     private Integer sketchId;
 
     @ApiModelProperty(value = "閫佽揣閲�", example = "1")
-    @ExcelColumn(name="閫佽揣閲�")
-    private Integer totalNum;
+    @ExcelColumn(name="閫佽揣閲�(鏉�)",index =5,width = 10)
+    private BigDecimal totalNum;
 
-    @ApiModelProperty(value = "瀹㈡埛鏁�", example = "1")
-    @ExcelColumn(name="瀹㈡埛鏁�")
-    private Integer orderNum;
+    @ApiModelProperty(value = "璁㈠崟缂栫爜锛堝叧鑱攋k_orders)", example = "1")
+    //@ExcelColumn(name="璁㈠崟缂栫爜锛堝叧鑱攋k_orders)")
+    private Integer orderId;
+    @ApiModelProperty(value = "瀹㈡埛缂栫爜锛堝叧鑱攋k_customer)", example = "1")
+    //@ExcelColumn(name="瀹㈡埛缂栫爜锛堝叧鑱攋k_customer)")
+    private Integer customerId;
 
     @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
-    @ExcelColumn(name="鎺掑簭鐮�")
+    //@ExcelColumn(name="鎺掑簭鐮�")
     private Integer sortnum;
 
     @ApiModelProperty(value = "鏃ユ湡")
-    @ExcelColumn(name="鏃ユ湡")
+    @ExcelColumn(name="閫佽揣鏃ユ湡",index = 6,width = 10)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date dateInfo;
 
+
+    @ApiModelProperty(value = "瀹㈡埛缂栫爜", example = "1")
+    @ExcelColumn(name="瀹㈡埛缂栫爜",index = 1,width = 10)
+    @TableField(exist = false)
+    private String code;
+    @ApiModelProperty(value = "瀹㈡埛濮撳悕", example = "1")
+    @ExcelColumn(name="瀹㈡埛濮撳悕",index = 2,width = 10)
+    @TableField(exist = false)
+    private String name;
+    @ApiModelProperty(value = "绾胯矾鍚嶇О", example = "1")
+    @ExcelColumn(name="绾胯矾",index = 4,width = 10)
+    @TableField(exist = false)
+    private String lineName;
+    @ApiModelProperty(value = "鎵�灞炰富绾胯矾", example = "1")
+    @ExcelColumn(name="鎵�灞炰富绾胯矾",index = 3,width = 10)
+    @TableField(exist = false)
+    private String categoryName;
+    @ApiModelProperty(value = "鎵�灞炰富绾胯矾缂栫爜", example = "1")
+    //@ExcelColumn(name="鎵�灞炰富绾胯矾",index = 2,width = 10)
+    @TableField(exist = false)
+    private Integer categoryId;
 }

--
Gitblit v1.9.3