productDev/dmvisit.git

			@@ -1,5 +1,6 @@
			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;
			@@ -11,6 +12,8 @@
			import com.fasterxml.jackson.annotation.JsonFormat;
			import java.util.Date;
			import java.math.BigDecimal;
			import java.util.List;
			import java.util.Map;

			/**
			* 交控-客户信息表
			@@ -23,69 +26,114 @@
			public class JkCustomer 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="创建时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			//@ExcelColumn(name="创建时间")IMPORTING_JKCUSTOMER
			private Date createDate;

			@ApiModelProperty(value = "更新人编码", example = "1")
			@ExcelColumn(name="更新人编码")
			//@ExcelColumn(name="更新人编码")
			private Integer editor;

			@ApiModelProperty(value = "更新时间")
			@ExcelColumn(name="更新时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			//@ExcelColumn(name="更新时间")IMPORTING_JKCUSTOMER
			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;
			@ExcelColumn(name="客户名称",index = 2,width = 10)
			private String name;

			@ApiModelProperty(value = "编码", example = "1")
			@ExcelColumn(name="编码")
			private Integer code;
			@ExcelColumn(name="客户简码",index = 1,width = 10)
			private String code;

			@ApiModelProperty(value = "所在位置")
			@ExcelColumn(name="所在位置")
			private String lacation;
			@ExcelColumn(name="地址",index = 3,width = 10)
			private String location;

			@ApiModelProperty(value = "经度", example = "1")
			@ExcelColumn(name="经度")
			//@ExcelColumn(name="经度")
			private BigDecimal longitude;

			@ApiModelProperty(value = "维度", example = "1")
			@ExcelColumn(name="维度")
			//@ExcelColumn(name="维度")
			private BigDecimal latitude;

			@ApiModelProperty(value = "配送周期")
			@ExcelColumn(name="配送周期")
			private String weeks;
			@ApiModelProperty(value = "客户序号")
			@ExcelColumn(name="序号",index = 8,width = 10)
			private String sortno;

			@ApiModelProperty(value = "经纬度", example = "1")
			@ExcelColumn(name="经纬度",index = 3,width = 10)
			@TableField(exist = false)
			private String locationInfo;
			@ApiModelProperty(value = "送货路线编码（关联jk_line)", example = "1")
			@ExcelColumn(name="送货路线编码（关联jk_line)")
			//@ExcelColumn(name="送货路线编码（关联jk_line)")
			private Integer lineId;

			@ApiModelProperty(value = "状态 0正常禁用", example = "1")
			@ExcelColumn(name="状态 0正常禁用")
			//@ExcelColumn(name="状态 0正常禁用")
			private Integer status;
			@ApiModelProperty(value = "距离计算状态 0未计算 1已计算 2未定位", example = "1")
			//@ExcelColumn(name="状态 0正常禁用")
			private Integer distanceStatus;
			@ApiModelProperty(value = "客户间距离集合", example = "1")
			//@ExcelColumn(name="状态 0正常禁用")
			private String distance;
			@ApiModelProperty(value = "园区距离该客户的距离（米）", example = "1")
			//@ExcelColumn(name="状态 0正常禁用")
			private Long startDistance;
			@ApiModelProperty(value = "该客户返回园区的距离（米）", example = "1")
			//@ExcelColumn(name="状态 0正常禁用")
			private Long endDistance;
			@ApiModelProperty(value = "园区距离该客户的路径经纬度集合，分号隔开", example = "1")
			//@ExcelColumn(name="状态 0正常禁用")
			private String startSteps;
			@ApiModelProperty(value = "该客户返回园区的路径经纬度集合，分号隔开", example = "1")
			//@ExcelColumn(name="状态 0正常禁用")
			private String endSteps;

			@ApiModelProperty(value = "排序码", example = "1")
			@ExcelColumn(name="排序码")
			//@ExcelColumn(name="排序码")
			private Integer sortnum;

			@ApiModelProperty(value = "所属主线路", example = "1")
			@ExcelColumn(name="所属主线路",index = 7,width = 10)
			@TableField(exist = false)
			private String categoryName;
			@ApiModelProperty(value = "所属主线路编码", example = "1")
			@TableField(exist = false)
			private Integer categoryId;
			@ApiModelProperty(value = "线路", example = "1")
			@ExcelColumn(name="送货线路",index = 6,width = 10)
			@TableField(exist = false)
			private String lineName;
			@ApiModelProperty(value = "配送周期", example = "1")
			@ExcelColumn(name="配送周期",index = 5,width = 10)
			@TableField(exist = false)
			private String lineWeeks;
			@ApiModelProperty(value = "是否新增， 0否 1是", example = "1")
			@TableField(exist = false)
			private int isnew;

			@ApiModelProperty(value = "同班组间客户位置距离数组，[{a:12,b:100},{a:13,b:200},...],a：客户编码，b：与客户a之间的距离")
			@TableField(exist = false)
			private List<Map<String,Object>> distanceList;


			}