feat(entities): 添加实体字段并优化订单查询
- 在CreditJudgmentDebtor实体中新增原告/上诉人、被告/被上诉人和其他当事人字段 - 在CreditJudgmentDebtorImportParam参数类中添加对应的Excel映射字段 - 在GltTicketOrder实体中新增门店、配送员和仓库的名称地址相关字段 - 更新GltTicketOrderMapper.xml查询SQL,关联店铺和配送员信息 - 添加门店名称、地址、手机号及配送员姓名、手机号等非数据库字段映射
This commit is contained in:
@@ -40,6 +40,15 @@ public class CreditJudgmentDebtor implements Serializable {
|
||||
@Schema(description = "被执行人")
|
||||
private String name1;
|
||||
|
||||
@Schema(description = "原告/上诉人")
|
||||
private String plaintiffAppellant;
|
||||
|
||||
@Schema(description = "被告/被上诉人")
|
||||
private String appellee;
|
||||
|
||||
@Schema(description = "其他当事人/第三人")
|
||||
private String otherPartiesThirdParty;
|
||||
|
||||
@Schema(description = "证件号/组织机构代码")
|
||||
private String code;
|
||||
|
||||
|
||||
@@ -22,6 +22,15 @@ public class CreditJudgmentDebtorImportParam implements Serializable {
|
||||
@Excel(name = "被执行人")
|
||||
private String name1;
|
||||
|
||||
@Excel(name = "原告/上诉人")
|
||||
private String plaintiffAppellant;
|
||||
|
||||
@Excel(name = "被告/被上诉人")
|
||||
private String appellee;
|
||||
|
||||
@Excel(name = "其他当事人/第三人")
|
||||
private String otherPartiesThirdParty;
|
||||
|
||||
@Excel(name = "证件号/组织机构代码")
|
||||
private String code;
|
||||
|
||||
@@ -40,15 +49,6 @@ public class CreditJudgmentDebtorImportParam implements Serializable {
|
||||
@Excel(name = "备注")
|
||||
private String comments;
|
||||
|
||||
@Excel(name = "原告/上诉人")
|
||||
private String plaintiffAppellant;
|
||||
|
||||
@Excel(name = "被告/被上诉人")
|
||||
private String appellee;
|
||||
|
||||
@Excel(name = "其他当事人/第三人")
|
||||
private String otherPartiesThirdParty;
|
||||
|
||||
@Schema(description = "发生时间")
|
||||
@Excel(name = "发生时间")
|
||||
private String occurrenceTime2;
|
||||
|
||||
@@ -34,12 +34,40 @@ public class GltTicketOrder implements Serializable {
|
||||
@Schema(description = "门店ID")
|
||||
private Integer storeId;
|
||||
|
||||
@Schema(description = "门店名称")
|
||||
@TableField(exist = false)
|
||||
private String storeName;
|
||||
|
||||
@Schema(description = "门店地址")
|
||||
@TableField(exist = false)
|
||||
private String storeAddress;
|
||||
|
||||
@Schema(description = "门店手机号")
|
||||
@TableField(exist = false)
|
||||
private String storePhone;
|
||||
|
||||
@Schema(description = "配送员")
|
||||
private Integer riderId;
|
||||
|
||||
@Schema(description = "配送员名称")
|
||||
@TableField(exist = false)
|
||||
private String riderName;
|
||||
|
||||
@Schema(description = "配送员手机号")
|
||||
@TableField(exist = false)
|
||||
private String riderPhone;
|
||||
|
||||
@Schema(description = "仓库ID")
|
||||
private Integer warehouseId;
|
||||
|
||||
@Schema(description = "仓库名称")
|
||||
@TableField(exist = false)
|
||||
private String warehouseName;
|
||||
|
||||
@Schema(description = "仓库地址")
|
||||
@TableField(exist = false)
|
||||
private String warehouseAddress;
|
||||
|
||||
@Schema(description = "关联收货地址")
|
||||
private Integer addressId;
|
||||
|
||||
|
||||
@@ -4,8 +4,12 @@
|
||||
|
||||
<!-- 关联查询sql -->
|
||||
<sql id="selectSql">
|
||||
SELECT a.*, u.nickname, u.phone, u.avatar
|
||||
SELECT a.*, b.name as storeName, b.address as storeAddress, b.phone as storePhone,
|
||||
c.real_name as riderName, c.mobile as riderPhone,
|
||||
u.nickname, u.phone, u.avatar
|
||||
FROM glt_ticket_order a
|
||||
LEFT JOIN shop_store b ON a.store_id = b.id
|
||||
LEFT JOIN shop_store_rider c ON a.rider_id = c.user_id
|
||||
LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id
|
||||
|
||||
<where>
|
||||
|
||||
Reference in New Issue
Block a user