From d5e01405a50c89966ae06363b09fd385b47f99f0 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 24 十月 2025 16:47:55 +0800
Subject: [PATCH] 问题修改
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkOrders.java | 79 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 20 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkOrders.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkOrders.java
index 74bcb58..3a3f4ca 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkOrders.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkOrders.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,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,65 +24,98 @@
@Data
@ApiModel("浜ゆ帶-閿�鍞鍗曚俊鎭〃")
@TableName("`jk_orders`")
-public class JkOrders {
+public class JkOrders 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 = "鍚嶇О", example = "1")
- @ExcelColumn(name="鍚嶇О")
- private Integer name;
+ @ApiModelProperty(value = "瀹㈡埛缂栫爜鍏宠仈锛坖k_customer)", example = "1")
+ //@ExcelColumn(name="瀹㈡埛缂栫爜鍏宠仈")
+ private Integer customerId;
@ApiModelProperty(value = "閿�閲�", example = "1")
- @ExcelColumn(name="閿�閲�")
- private Integer num;
+ @ExcelColumn(name="鏁伴噺",index = 3,width = 10)
+ private BigDecimal num;
@ApiModelProperty(value = "閫佽揣璺嚎缂栫爜锛堝叧鑱攋k_line)", example = "1")
- @ExcelColumn(name="閫佽揣璺嚎缂栫爜锛堝叧鑱攋k_line)")
+ //@ExcelColumn(name="閫佽揣璺嚎缂栫爜锛堝叧鑱攋k_line)")
private Integer lineId;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 绂佺敤", example = "1")
- @ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
private Integer status;
- @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelColumn(name="鎺掑簭鐮�")
- private Integer sortnum;
+ @ApiModelProperty(value = "搴忓彿", example = "1")
+ @ExcelColumn(name="搴忓彿",index = 5,width = 10)
+ private String sortnum;
@ApiModelProperty(value = "鏃ユ湡")
- @ExcelColumn(name="鏃ユ湡")
+ @ExcelColumn(name="閫佽揣鏃ユ湡",index = 6,width = 10)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date dateInfo;
@ApiModelProperty(value = "鍚岀彮缁勯棿瀹㈡埛浣嶇疆璺濈鏁扮粍锛孾{a:12,b:100},{a:13,b:200},...],a锛氬鎴风紪鐮侊紝b锛氫笌瀹㈡埛a涔嬮棿鐨勮窛绂�")
- @ExcelColumn(name="鍚岀彮缁勯棿瀹㈡埛浣嶇疆璺濈鏁扮粍锛孾{a:12,b:100},{a:13,b:200},...],a锛氬鎴风紪鐮侊紝b锛氫笌瀹㈡埛a涔嬮棿鐨勮窛绂�")
+ //@ExcelColumn(name="鍚岀彮缁勯棿瀹㈡埛浣嶇疆璺濈鏁扮粍锛孾{a:12,b:100},{a:13,b:200},...],a锛氬鎴风紪鐮侊紝b锛氫笌瀹㈡埛a涔嬮棿鐨勮窛绂�")
private String distances;
+ @ApiModelProperty(value = "鍚岀彮缁勯棿瀹㈡埛浣嶇疆璺濈鏁扮粍锛孾{a:12,b:100},{a:13,b:200},...],a锛氬鎴风紪鐮侊紝b锛氫笌瀹㈡埛a涔嬮棿鐨勮窛绂�")
+ @TableField(exist = false)
+ private List<Map<String,Object>> distanceList;
+ @ApiModelProperty(value = "瀹㈡埛濮撳悕", example = "1")
+ @ExcelColumn(name="瀹㈡埛濮撳悕",index = 2,width = 10)
+ @TableField(exist = false)
+ private String name;
+ @ApiModelProperty(value = "瀹㈡埛缂栫爜", example = "1")
+ @ExcelColumn(name="瀹㈡埛缂栫爜",index = 1,width = 10)
+ @TableField(exist = false)
+ private String code;
+ @ApiModelProperty(value = "绾胯矾鍚嶇О", example = "1")
+ @ExcelColumn(name="绾胯矾",index = 4,width = 10)
+ @TableField(exist = false)
+ private String lineName;
+ @ApiModelProperty(value = "鎵�灞炰富绾胯矾", example = "1")
+ //@ExcelColumn(name="鎵�灞炰富绾胯矾",index = 2,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 = "缁村害", example = "1")
+ //@ExcelColumn(name="缁村害")
+ @TableField(exist = false)
+ private BigDecimal latitude;
}
--
Gitblit v1.9.3