From 5841a771d4455d25adb185b8a0637c9ba498aab2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 21 十月 2025 15:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java | 107 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 90 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..8894d2e 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,9 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.tsp.DistanceMapParam;
+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,7 +11,11 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* 浜ゆ帶-绾胯矾浼樺寲绾胯矾瀹㈡埛璁板綍淇℃伅琛�
@@ -18,61 +25,127 @@
@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;
+ @ApiModelProperty(value = "缁忓害", example = "1")
+ //@ExcelColumn(name="缁忓害")
+ @TableField(exist = false)
+ private BigDecimal longitude;
+ @ApiModelProperty(value = "鎵�鍦ㄤ綅缃�")
+ @TableField(exist = false)
+ private String location;
+ @ApiModelProperty(value = "缁村害", example = "1")
+ //@ExcelColumn(name="缁村害")
+ @TableField(exist = false)
+ private BigDecimal latitude;
+ @ApiModelProperty(value = "绾胯矾璺濈", example = "1")
+ @TableField(exist = false)
+ private String distanceJson;
+
+ @ApiModelProperty(value = "鍥尯璺濈璇ュ鎴风殑璺濈锛堢背锛�", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ @TableField(exist = false)
+ private Long startDistance;
+ @ApiModelProperty(value = "瀹㈡埛鏄惁瀹屾垚浜ら�氳鍒�", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ @TableField(exist = false)
+ private Integer distanceStatus;
+ @ApiModelProperty(value = "璇ュ鎴疯繑鍥炲洯鍖虹殑璺濈锛堢背锛�", example = "1")
+ @TableField(exist = false)
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ private Long endDistance;
+ @ApiModelProperty(value = "鍥尯璺濈璇ュ鎴风殑璺緞缁忕含搴﹂泦鍚堬紝鍒嗗彿闅斿紑", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ @TableField(exist = false)
+ private String startSteps;
+ @ApiModelProperty(value = "璇ュ鎴疯繑鍥炲洯鍖虹殑璺緞缁忕含搴﹂泦鍚堬紝鍒嗗彿闅斿紑", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ @TableField(exist = false)
+ private String endSteps;
+ @ApiModelProperty(value = "鍚岀彮缁勯棿瀹㈡埛浣嶇疆璺濈鏁扮粍锛孾{a:12,b:100},{a:13,b:200},...],a锛氬鎴风紪鐮侊紝b锛氫笌瀹㈡埛a涔嬮棿鐨勮窛绂�")
+ @TableField(exist = false)
+ private List<DistanceMapParam> distanceMapParamList;
+ @ApiModelProperty(value = "绫诲瀷 0浼樺寲鍓� 1浼樺寲鍚�", example = "1")
+ private Integer type;
}
--
Gitblit v1.9.3