Merge remote-tracking branch 'origin/master'

src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java

@@ -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;
 

src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java

@@ -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;

src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java

@@ -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;
 

src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml

@@ -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>