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/JkSketch.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java
index 792e207..414c7af 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java
@@ -13,6 +13,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 浜ゆ帶-绾胯矾浼樺寲璁板綍淇℃伅琛�
@@ -61,6 +62,20 @@
@ApiModelProperty(value = "褰撳墠绾胯矾鏁�", example = "1")
//@ExcelColumn(name="涓荤嚎璺紪鐮侊紙鍏宠仈category)")
private Integer lineNum;
+ @ApiModelProperty(value = "鏈�鏂颁紭鍖栫嚎璺暟", example = "1")
+ //@ExcelColumn(name="涓荤嚎璺紪鐮侊紙鍏宠仈category)")
+ private Integer planLineNum;
+ @ApiModelProperty(value = "浼樺寲缁撴灉", example = "1")
+ //@ExcelColumn(name="涓荤嚎璺紪鐮侊紙鍏宠仈category)")
+ private String planLineInfo;
+ @ApiModelProperty(value = "浼樺寲鏃堕棿", example = "1")
+ //@ExcelColumn(name="涓荤嚎璺紪鐮侊紙鍏宠仈category)")
+ private Date planLineDate;
+ @ApiModelProperty(value = "浼樺寲缁撴潫鏃堕棿", example = "1")
+ private Date planLineEndDate;
+ @ApiModelProperty(value = "浼樺寲浜哄憳", example = "1")
+ //@ExcelColumn(name="涓荤嚎璺紪鐮侊紙鍏宠仈category)")
+ private Integer planLineUserId;
@ApiModelProperty(value = "閫佽揣閲�", example = "1")
@ExcelColumn(name="閫佽揣閲忥紙鏉★級",index = 4,width = 10)
@@ -70,25 +85,54 @@
@ExcelColumn(name="瀹㈡埛鏁帮紙鎴凤級",index = 3,width = 7)
private Integer orderNum;
- @ApiModelProperty(value = "鐘舵�� 0鏈紭鍖� 1浼樺寲涓� 2宸蹭紭鍖�", example = "1")
- @ExcelColumn(name="鐘舵��",index = 5,width = 10,valueMapping = "0=鏈紭鍖�;1=浼樺寲涓�;2=宸蹭紭鍖�;")
+ @ApiModelProperty(value = "鐘舵�� 0鏈紭鍖� 1浼樺寲涓� 2宸蹭紭鍖� 3浼樺寲澶辫触", example = "1")
+ @ExcelColumn(name="鐘舵��",index = 5,width = 10,valueMapping = "0=鏈紭鍖�;1=浼樺寲涓�;2=宸蹭紭鍖�;3=浼樺寲澶辫触;")
private Integer status;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
//@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+ @ApiModelProperty(value = "浼樺寲鐘舵�� 0鏈紭鍖� 1宸茬敓鎴愬凡浼樺寲绾胯矾", example = "1")
+ //@ExcelColumn(name="鎺掑簭鐮�")
+ private Integer optStatus;
@ApiModelProperty(value = "浼樺寲璁板綍缂栫爜(浣滀负key鍊煎瓨redis锛�", example = "1")
//@ExcelColumn(name="鐝粍缂栫爜锛堝叧鑱攃ategory锛�")
private String jobId;
+ @ApiModelProperty(value = "浼樺寲閲岀▼鏁帮紙绫筹級", example = "1")
+ private Long distance;
+ @ApiModelProperty(value = "鍘熷閲岀▼鏁帮紙绫筹級", example = "1")
+ private Long originDistance;
@ApiModelProperty(value = "鏃ユ湡")
@ExcelColumn(name="閫佽揣鏃ユ湡",index = 1,width = 10)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date dateInfo;
-
@ApiModelProperty(value = "鎵�灞炰富绾胯矾", example = "1")
@ExcelColumn(name="涓荤嚎璺�",index = 2,width = 10)
@TableField(exist = false)
private String categoryName;
+ @ApiModelProperty(value = "鏄惁寮哄埗浼樺寲 0鍚� 1鏄�", example = "1")
+ @TableField(exist = false)
+ private Integer forceUpdate;
+ @ApiModelProperty(value = "绾胯矾瀹㈡埛璁㈠崟淇℃伅", example = "1")
+ @TableField(exist = false)
+ List<JkSketchCustomer> customerList;
+ @ApiModelProperty(value = "绾胯矾闆嗗悎", example = "1")
+ @TableField(exist = false)
+ List<JkLine> lineList;
+ @ApiModelProperty(value = "绾胯矾闆嗗悎(璋冩暣鍚庯級", example = "1")
+ @TableField(exist = false)
+ List<JkSketchLine> sketchLineList;
+ @ApiModelProperty(value = "绾胯矾缂栫爜闆嗗悎", example = "1")
+ @TableField(exist = false)
+ List<Integer> lineIdList;
+
+ @ApiModelProperty(value = "瀹㈡埛鏁伴噺", example = "1")
+ @TableField(exist = false)
+ private Integer customerNum;
+
+ @ApiModelProperty(value = "浼樺寲鍓嶇嚎璺暟閲�", example = "1")
+ @TableField(exist = false)
+ private Integer beforeLineNum;
}
--
Gitblit v1.9.3