- 在CrmOrder实体类中新增isTop字段用于标识是否置顶 - 在CrmOrderBo业务对象中添加isTop属性支持查询过滤 - 在CrmOrderVo视图对象中添加isTop属性并配置Excel导出 - 更新MyBatis映射文件添加isTop字段的数据库映射关系 - 修改订单查询服务实现支持按置顶状态进行查询过滤 - 重构排序逻辑将原有的订单类型+创建时间排序改为置顶优先+状态+创建时间排序 - 新排序规则:置顶订单优先显示、已生效状态次之、最后按创建时间倒序排列
235 lines
3.7 KiB
Java
235 lines
3.7 KiB
Java
package com.klp.crm.domain;
|
||
|
||
import com.baomidou.mybatisplus.annotation.*;
|
||
import com.klp.common.core.domain.BaseEntity;
|
||
import lombok.Data;
|
||
import lombok.EqualsAndHashCode;
|
||
|
||
import java.math.BigDecimal;
|
||
import java.util.Date;
|
||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||
|
||
/**
|
||
* 正式订单主对象 crm_order
|
||
*
|
||
* @author klp
|
||
* @date 2025-12-15
|
||
*/
|
||
@Data
|
||
@EqualsAndHashCode(callSuper = true)
|
||
@TableName("crm_order")
|
||
public class CrmOrder extends BaseEntity {
|
||
|
||
private static final long serialVersionUID=1L;
|
||
|
||
/**
|
||
* 订单ID(主键)
|
||
*/
|
||
@TableId(value = "order_id")
|
||
private Long orderId;
|
||
/**
|
||
* 订单编号
|
||
*/
|
||
private String orderCode;
|
||
/**
|
||
* 订单类型:pre-预订单,formal-正式订单
|
||
*/
|
||
private Long orderType;
|
||
/**
|
||
* 关联客户ID
|
||
*/
|
||
private String customerId;
|
||
/**
|
||
* 订单总金额
|
||
*/
|
||
private BigDecimal orderAmount;
|
||
/**
|
||
* 销售员
|
||
*/
|
||
private String salesman;
|
||
/**
|
||
* 交货日期
|
||
*/
|
||
private Date deliveryDate;
|
||
/**
|
||
* 预订单状态
|
||
*/
|
||
private Long preOrderStatus;
|
||
/**
|
||
* 审核人
|
||
*/
|
||
private String auditUser;
|
||
/**
|
||
* 审核时间
|
||
*/
|
||
private Date auditTime;
|
||
/**
|
||
* 订单状态
|
||
*/
|
||
private Long orderStatus;
|
||
/**
|
||
* 财务状态
|
||
*/
|
||
private Long financeStatus;
|
||
/**
|
||
* 未结款数额
|
||
*/
|
||
private BigDecimal unpaidAmount;
|
||
/**
|
||
* 备注
|
||
*/
|
||
private String remark;
|
||
|
||
/**
|
||
* 合同号
|
||
*/
|
||
private String contractCode;
|
||
|
||
/**
|
||
* 合同名称
|
||
*/
|
||
private String contractName;
|
||
|
||
/**
|
||
* 供方
|
||
*/
|
||
private String supplier;
|
||
|
||
/**
|
||
* 需方
|
||
*/
|
||
private String customer;
|
||
|
||
/**
|
||
* 签订时间
|
||
*/
|
||
private Date signTime;
|
||
|
||
/**
|
||
* 签订地点
|
||
*/
|
||
private String signLocation;
|
||
|
||
/**
|
||
* 产品内容
|
||
*/
|
||
private String productContent;
|
||
|
||
/**
|
||
* 合同内容
|
||
*/
|
||
private String contractContent;
|
||
|
||
/**
|
||
* 供方地址
|
||
*/
|
||
private String supplierAddress;
|
||
|
||
/**
|
||
* 供方电话
|
||
*/
|
||
private String supplierPhone;
|
||
|
||
/**
|
||
* 供方开户行
|
||
*/
|
||
private String supplierBank;
|
||
|
||
/**
|
||
* 供方账号
|
||
*/
|
||
private String supplierAccount;
|
||
|
||
/**
|
||
* 供方税号
|
||
*/
|
||
private String supplierTaxNo;
|
||
|
||
/**
|
||
* 需方地址
|
||
*/
|
||
private String customerAddress;
|
||
|
||
/**
|
||
* 需方电话
|
||
*/
|
||
private String customerPhone;
|
||
|
||
/**
|
||
* 需方开户行
|
||
*/
|
||
private String customerBank;
|
||
|
||
/**
|
||
* 需方账号
|
||
*/
|
||
private String customerAccount;
|
||
|
||
/**
|
||
* 需方税号
|
||
*/
|
||
private String customerTaxNo;
|
||
|
||
/**
|
||
* 技术附件
|
||
*/
|
||
private String techAnnex;
|
||
|
||
/**
|
||
* 商务附件
|
||
*/
|
||
private String businessAnnex;
|
||
|
||
/**
|
||
* 排产函
|
||
*/
|
||
private String productionSchedule;
|
||
|
||
/**
|
||
* 算单价备注
|
||
*/
|
||
private String unitPriceRemark;
|
||
|
||
/**
|
||
* 应付定金(万元)
|
||
*/
|
||
private BigDecimal depositPayable;
|
||
|
||
/**
|
||
* 已付定金(万元)
|
||
*/
|
||
private BigDecimal depositPaid;
|
||
|
||
/**
|
||
* 定金比例(%)
|
||
*/
|
||
private BigDecimal depositRatio;
|
||
|
||
/**
|
||
* 合同状态 0=草稿 1=生效 2=作废 3=已完成
|
||
*/
|
||
private Long status;
|
||
|
||
/**
|
||
* 关联合同ID(wms_contract.contract_id)
|
||
*/
|
||
private Long contractId;
|
||
|
||
/**
|
||
* 附件(多个文件URL用逗号分隔)
|
||
*/
|
||
private String annexFiles;
|
||
|
||
/**
|
||
* 删除标识 0正常 2删除
|
||
*/
|
||
@TableLogic
|
||
private Long delFlag;
|
||
|
||
/**
|
||
* 是否置顶 0-否 1-是
|
||
*/
|
||
private Integer isTop;
|
||
|
||
}
|