From 7f70584621c77c4111f3c998beee184120eb4067 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 20 十月 2025 15:56:54 +0800
Subject: [PATCH] 优化
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchLine.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchLine.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchLine.java
index 24f400c..a418b93 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchLine.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchLine.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,7 +10,10 @@
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;
/**
* 浜ゆ帶-绾胯矾浼樺寲绾胯矾璁板綍淇℃伅琛�
@@ -18,8 +23,9 @@
@Data
@ApiModel("浜ゆ帶-绾胯矾浼樺寲绾胯矾璁板綍淇℃伅琛�")
@TableName("`jk_sketch_line`")
-public class JkSketchLine {
+public class JkSketchLine extends LoginUserModel {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
private Integer id;
@@ -53,6 +59,9 @@
@ApiModelProperty(value = "绾胯矾缂栫爜锛堝叧鑱攋k_line)", example = "1")
@ExcelColumn(name="绾胯矾缂栫爜锛堝叧鑱攋k_line)")
private Integer lineId;
+ @ApiModelProperty(value = "璺▼鏁�", example = "1")
+ @ExcelColumn(name="璺▼鏁�")
+ private Long distance;
@ApiModelProperty(value = "绾胯矾浼樺寲缂栫爜锛堝叧鑱攋k_sketch)", example = "1")
@ExcelColumn(name="绾胯矾浼樺寲缂栫爜锛堝叧鑱攋k_sketch)")
@@ -60,7 +69,7 @@
@ApiModelProperty(value = "閫佽揣閲�", example = "1")
@ExcelColumn(name="閫佽揣閲�")
- private Integer totalNum;
+ private BigDecimal totalNum;
@ApiModelProperty(value = "瀹㈡埛鏁�", example = "1")
@ExcelColumn(name="瀹㈡埛鏁�")
@@ -69,10 +78,42 @@
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+ @ApiModelProperty(value = "绫诲瀷 0浼樺寲鍓� 1浼樺寲鍚�", example = "1")
+ private Integer type;
@ApiModelProperty(value = "鏃ユ湡")
@ExcelColumn(name="鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date dateInfo;
+
+ @ApiModelProperty(value = "浜ら�氳鍒掓槑缁嗭紙json鏁扮粍闆嗗悎锛�", example = "1")
+ private String steps;
+ @ApiModelProperty(value = "杞︾墝鍙�", example = "1")
+ @TableField(exist = false)
+ private String carCode;
+ @ApiModelProperty(value = "閫佽揣鍙告満", example = "1")
+ @TableField(exist = false)
+ private String memberName;
+ @ApiModelProperty(value = "绾胯矾鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String lineName;
+ @ApiModelProperty(value = "鎵�灞炰富绾胯矾", example = "1")
+ @TableField(exist = false)
+ private String categoryName;
+ @ApiModelProperty(value = "鎵�灞炰富绾胯矾缂栫爜", example = "1")
+ @TableField(exist = false)
+ private Integer categoryId;
+ @ApiModelProperty(value = "瀹㈡埛鏄庣粏", example = "1")
+ @TableField(exist = false)
+ private List<JkSketchCustomer> customerList;
+
+ @ApiModelProperty(value = "鏈�澶у鎴烽噺", example = "1")
+ @TableField(exist = false)
+ private Integer maxCustomer;
+
+ @ApiModelProperty(value = "鏈�澶ц鍗曢噺", example = "1")
+ @TableField(exist = false)
+ private Integer maxOrder;
+
}
--
Gitblit v1.9.3