From 275aa50b1de31ace0cb17fdf0b6f678a63267b3c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 20 十月 2025 10:14:01 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java | 89 ++++++++++++++++++++++++++++++++++----------
1 files changed, 69 insertions(+), 20 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 711ceb5..ee0a482 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
@@ -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,65 +23,109 @@
@Data
@ApiModel("浜ゆ帶-绾胯矾浼樺寲璁板綍淇℃伅琛�")
@TableName("`jk_sketch`")
-public class JkSketch {
+public class JkSketch 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="鍒涘缓鏃堕棿")
+ //@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 = "涓荤嚎璺紪鐮侊紙鍏宠仈category)", example = "1")
- @ExcelColumn(name="涓荤嚎璺紪鐮侊紙鍏宠仈category)")
+ //@ExcelColumn(name="涓荤嚎璺紪鐮侊紙鍏宠仈category)")
private Integer categoryId;
+ @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="閫佽揣閲�")
- private Integer totalNum;
+ @ExcelColumn(name="閫佽揣閲忥紙鏉★級",index = 4,width = 10)
+ private BigDecimal totalNum;
@ApiModelProperty(value = "瀹㈡埛鏁�", example = "1")
- @ExcelColumn(name="瀹㈡埛鏁�")
+ @ExcelColumn(name="瀹㈡埛鏁帮紙鎴凤級",index = 3,width = 7)
private Integer orderNum;
- @ApiModelProperty(value = "鐘舵�� 0鏈紭鍖� 1浼樺寲涓� 2宸蹭紭鍖�", example = "1")
- @ExcelColumn(name="鐘舵�� 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="鎺掑簭鐮�")
+ //@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="鏃ユ湡")
+ @ExcelColumn(name="閫佽揣鏃ユ湡",index = 1,width = 10)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date dateInfo;
- @ApiModelProperty(value = "浼樺寲璁板綍缂栫爜(浣滀负key鍊煎瓨redis锛�")
- @ExcelColumn(name="浼樺寲璁板綍缂栫爜(浣滀负key鍊煎瓨redis锛�")
- private String jobId;
+ @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;
}
--
Gitblit v1.9.3