需求31 报价单列表新增创建人

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

@@ -98,7 +98,9 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
             "if(#{lang} = 0, o.objective ->> '$.titleZh', o.objective ->> '$.titleEn') as objective_name, ",
             "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, ",
+            "(SELECT su.nickname FROM system_user as su WHERE su.id = o.creator AND su.deleted = 0 ) as creator_name,",
+            // 跟进客户经理
+            "u.nickname as follow_up_salesman_name, ",
             "u.nickname as business_manager_name, ",
             "cc.name as relation_name, ",
             "cc.area_code as relation_area_code, ",
@@ -198,6 +200,12 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
                 "AND o.`follow_up_salesman_id` IN ",
                 "<foreach item='id' collection='pageVO.salesmanIds' open='(' close=')' separator=','> #{id} </foreach>",
             "</when>",
+            // 根据创建人查询
+            "<when test = 'pageVO.creatorIds != null and pageVO.creatorIds.size() > 0'>",
+            "AND o.`creator` IN ",
+            "<foreach item='id' collection='pageVO.creatorIds' open='(' close=')' separator=','> #{id} </foreach>",
+            "</when>",
+
             "<when test = 'pageVO.statusList != null and pageVO.statusList.size() > 0'>",
                 "AND o.`status` IN ",
                 "<foreach item='it' collection='pageVO.statusList' open='(' close=')' separator=','> #{it} </foreach>",
@@ -337,6 +345,11 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
             "AND o.`follow_up_salesman_id` IN ",
             "<foreach item='id' collection='pageVO.salesmanIds' open='(' close=')' separator=','> #{id} </foreach>",
             "</when>",
+            // 根据创建人查询
+            "<when test = 'pageVO.creatorIds != null and pageVO.creatorIds.size() > 0'>",
+            "AND o.`creator` IN ",
+            "<foreach item='id' collection='pageVO.creatorIds' open='(' close=')' separator=','> #{id} </foreach>",
+            "</when>",
             "<when test = 'pageVO.statusList != null and pageVO.statusList.size() > 0'>",
             "AND o.`status` IN ",
             "<foreach item='it' collection='pageVO.statusList' open='(' close=')' separator=','> #{it} </foreach>",
@@ -426,6 +439,8 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
             "<script>",
             "SELECT",
             "o.*,",
+            "(SELECT su.nickname FROM system_user as su WHERE su.id = o.creator AND su.deleted = 0 ) as creator_name,",
+            "(SELECT su.nickname FROM system_user as su WHERE su.id = o.updater AND su.deleted = 0 ) as updater_name,",
             "d.name as dept_name,",
             "u.nickname as business_manager_name,",
             "if(#{lang} = 0, c.name_zh, c.name_en) as channel_name, ",

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

@@ -189,6 +189,9 @@ public class OfferPageReqVO extends PageParam {
     @ApiModelProperty(value = "客户经理列表")
     private List<Long> salesmanIds;
 
+    @ApiModelProperty(value = "创建人列表")
+    private List<Long> creatorIds;
+
     @ApiModelProperty(value = "阶段列表")
     private List<Integer> statusList;
 

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

@@ -49,10 +49,14 @@ public class OfferRespVO extends OfferBaseVO {
     @ApiModelProperty(value = "业务员名称")
     private String creatorName;
 
+    @ApiModelProperty(value = "更新业务员名称")
+    private String updaterName;
+
     @ApiModelProperty(value = "跟进业务员")
     private String followUpSalesmanId;
 
-
+    @ApiModelProperty(value = "跟进业务员名称")
+    private String followUpSalesmanName;
 
     @ApiModelProperty(value = "关联客户名称")
     private String relationName;