fix: 跟进导出完善

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customerFollowup/CustomerFollowupBackVO.java

@@ -17,7 +17,6 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ApiModel("管理后台 - 客户跟进 Response VO")
 public class CustomerFollowupBackVO {
 
-    @ExcelProperty("主键")
     @ApiModelProperty(value = "主键", required = true)
     private Long id;
 
@@ -25,60 +24,61 @@ public class CustomerFollowupBackVO {
     @ApiModelProperty(value = "编号")
     private String number;
 
-    @ExcelProperty("上一级跟进单号")
-    @ApiModelProperty(value = "上一级跟进单号")
-    private String parentNumber;
-
-    @ExcelProperty(value = "状态", converter = DictConvert.class)
-    @DictFormat("customer_followup_status")
-    @ApiModelProperty(value = "状态 字典customer_followup_status")
-    private Integer status;
-
-    @ApiModelProperty(value = "客户编号")
-    private Long customerId;
-
-    @ApiModelProperty(value = "报价单")
-    private Long offerId;
-
     @ExcelProperty(value = "跟进类型", converter = DictConvert.class)
     @DictFormat("customer_followup_type")
     @ApiModelProperty(value = "跟进类型 字典customer_followup_type")
     private Integer followType;
 
+    @ApiModelProperty(value = "报价单")
+    private Long offerId;
+    @ExcelProperty("报价单")
+    @ApiModelProperty(value = "报价单编号")
+    private String offerNumber;
+
     @ExcelProperty("跟进时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "跟进时间")
     private Date followTime;
 
+    @ApiModelProperty(value = "客户编号")
+    private Long customerId;
+    @ExcelProperty("客户编号")
+    @ApiModelProperty(value = "客户编号")
+    private String customerNumber;
+
     @ExcelProperty("联系人")
     @ApiModelProperty(value = "联系人")
     private String contactName;
 
+    //TODO 联系方式
+
+    @ApiModelProperty(value = "客户经理/跟进业务员id")
+    private Long followUserId;
+    @ExcelProperty("客户经理")
+    private String followUserName;
+
+
+
+
     @ExcelProperty(value = "跟进方式", converter = DictConvert.class)
     @DictFormat("customer_followup_method")
     @ApiModelProperty(value = "跟进类型 字典customer_followup_type")
     private Integer followMethod;
 
-    @ExcelProperty("客户经理/跟进业务员id")
-    @ApiModelProperty(value = "客户经理/跟进业务员id")
-    private Long followUserId;
 
     @ExcelProperty("目的")
     @ApiModelProperty(value = "目的")
     private String purpose;
 
-    @ExcelProperty(value = "跟进结果", converter = DictConvert.class)
+    @ExcelProperty(value = "结果", converter = DictConvert.class)
     @DictFormat("customer_followup_result_type")
     @ApiModelProperty(value = "跟进结果 字典customer_followup_result_type")
     private Integer resultType;
 
-    @ExcelProperty("客户反馈")
+    @ExcelProperty("跟进情况")
     @ApiModelProperty(value = "客户反馈")
     private String feedback;
 
-    @ExcelProperty("附件 多个以逗号分隔")
-    @ApiModelProperty(value = "附件 多个以逗号分隔")
-    private String attatchment;
 
     @ExcelProperty("下次跟进时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -89,31 +89,44 @@ public class CustomerFollowupBackVO {
     @ApiModelProperty(value = "下次跟进计划")
     private String nextPlan;
 
+
+    @ExcelProperty("关联跟进纪录")
+    @ApiModelProperty(value = "上一级跟进单号")
+    private String parentNumber;
+
+
+    @ExcelProperty(value = "提交状态", converter = DictConvert.class)
+    @DictFormat("customer_followup_status")
+    @ApiModelProperty(value = "状态 字典customer_followup_status")
+    private Integer status;
+
+
+    //creator_name
+    @ExcelProperty("创建人")
+    @ApiModelProperty(value = "创建人名称")
+    private String creatorName;
+
     @ExcelProperty("创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "创建时间", required = true)
     private Date createTime;
 
-    @ExcelProperty("更新时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
 
 
-    @ExcelProperty("客户编号")
-    @ApiModelProperty(value = "客户编号")
-    private String customerNumber;
-    @ExcelProperty("报价单")
-    @ApiModelProperty(value = "报价单编号")
-    private String offerNumber;
-    //creator_name
-    @ExcelProperty("创建人id")
-    @ApiModelProperty(value = "创建人名称")
-    private String creatorName;
     // updater_name
-    @ExcelProperty("更新人id")
+    @ExcelProperty("最后更新人")
     @ApiModelProperty(value = "更新人名称")
     private String updaterName;
 
 
+    @ExcelProperty("最后更新时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+
+    @ApiModelProperty(value = "附件 多个以逗号分隔")
+    private String attatchment;
+
+
 }

yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerFollowupMapper.xml

@@ -39,12 +39,14 @@
     <select id="selectPage1" resultType="cn.iocoder.yudao.module.customer.dal.dataobject.customerFollowup.CustomerFollowupDO">
 
         select a.*, b.number as customer_number, c.number as offer_number,
-        d.nickname as creator_name, e.nickname as updater_name
+        d.nickname as creator_name, e.nickname as updater_name,
+        f.nickname as follow_user_name
         from ecw_customer_followup a
         left join ecw_customer b on a.customer_id = b.id
         left join ecw_offer c on a.offer_id = c.offer_id
         left join system_user d on a.creator = d.id
         left join system_user e on a.updater = e.id
+        left join system_user f on a.follow_user_id = f.id
 
         WHERE 1=1 AND a.deleted = 0