补充报价单列表查询反参

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java

@@ -106,6 +106,7 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
             // "o.est_cost, ",
             // "o.create_time, ",
             // "o.update_time, ",
+            "user.number as customer_number",
             "(select count(1) from ecw_customer_followup l where l.offer_id = o.offer_id) as log_count, ",
             "u.nickname as creator_name, ",
             "u.nickname as business_manager_name, ",
@@ -113,19 +114,19 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
             "cc.name as relation_name, ",
             "cc.area_code as relation_area_code, ",
             "cc.phone_new as relation_phone, ",
+            "if(#{lang} = 0, l.name_zh , l.name_en ) as channel_name, ",
             "line.start_warehouse_id, ",
             "line.dest_warehouse_id, ",
             "line.transport_type ",
 
             "from ecw_offer o ",
             "left join ecw_customer_contacts cc on (o.relation = 1 and cc.id = o.consignor_id) or (o.relation = 2 and cc.id = o.consignee_id) ",
-            "<when test = 'pageVO.sourceIds != null and pageVO.sourceIds.size() > 0'>",
-                "left join ecw_customer user on user.id = o.relation_id ",
-            "</when>",
+            "left join ecw_customer user on user.id = o.relation_id ",
             "left join system_user u on u.id = o.follow_up_salesman_id ",
             "left join ecw_region s on o.objective_id = s.id ",
             "left join ecw_warehouse_line line on o.line_id = line.id ",
             "left join ecw_warehouse dst on line.dest_warehouse_id = dst.id ",
+            "left join ecw_channel l on o.channel_id = l.channel_id ",
             "where o.deleted = 0",
 
             //destCountryIds

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/vo/offer/OfferRespVO.java

@@ -67,6 +67,11 @@ public class OfferRespVO extends OfferBaseVO {
     private String transportType;
 
 
+    @ApiModelProperty(value = "渠道名称")
+    private String channelName;
+
+    @ApiModelProperty(value = "客户编号")
+    private String customerNumber;
 
     @ApiModelProperty(value = "业务员名称-客户经理")
     private String businessManagerName;