Merge branch 'release-fix' into release

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/convert/customerFollowup/CustomerFollowupConvert.java

@@ -43,6 +43,7 @@ public interface CustomerFollowupConvert {
      * @return
      */
     List<CustomerFollowupBackVO> convertList(List<CustomerFollowupDO> list);
+    List<CustomerFollowupExcelVO> convertList2(List<CustomerFollowupDO> list);
 
     /***
      * 实体分页转返回分页

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

 package cn.iocoder.yudao.module.customer.vo.customerFollowup;
 
+import cn.iocoder.yudao.framework.excel.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.convert.DictConvert;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,100 +17,114 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 * @author yanghao
 */
 @Data
-@ApiModel("管理后台 - 客户跟进 Response VO")
+@ApiModel("管理后台 - 客户跟进Excel Response VO")
 public class CustomerFollowupExcelVO {
 
-    @ExcelProperty("主键")
-    @ApiModelProperty(value = "主键", required = true)
-    private Long id;
 
     @ExcelProperty("编号")
     @ApiModelProperty(value = "编号")
     private String number;
 
-    @ExcelProperty("上一级跟进单号")
-    @ApiModelProperty(value = "上一级跟进单号")
-    private String parentNumber;
+    @ExcelProperty(value = "跟进类型", converter = DictConvert.class)
+    @DictFormat("customer_followup_type")
+    @ApiModelProperty(value = "跟进类型 字典customer_followup_type")
+    private Integer followType;
 
-    @ExcelProperty("状态 字典customer_followup_status")
-    @ApiModelProperty(value = "状态 字典customer_followup_status")
-    private Integer status;
 
-    @ExcelProperty("客户编号")
-    @ApiModelProperty(value = "客户编号")
-    private Long customerId;
 
-    @ExcelProperty("报价单")
-    @ApiModelProperty(value = "报价单")
-    private Long offerId;
-
-    @ExcelProperty("跟进类型 字典customer_followup_type")
-    @ApiModelProperty(value = "跟进类型 字典customer_followup_type")
-    private Integer followType;
+    @ExcelProperty("报价单号")
+    @ApiModelProperty(value = "报价单编号")
+    private String offerNumber;
 
     @ExcelProperty("跟进时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "跟进时间")
     private Date followTime;
 
+
+    @ExcelProperty("客户编号")
+    @ApiModelProperty(value = "客户编号")
+    private String customerNumber;
+
+
     @ExcelProperty("联系人")
     @ApiModelProperty(value = "联系人")
     private String contactName;
 
-    @ExcelProperty("跟进方式 字典customer_followup_method")
+
+    @ExcelProperty("联系人电话")
+    @ApiModelProperty(value = "联系人电话")
+    private String contactPhone;
+
+    @ExcelProperty("客户经理")
+    private String followUserName;
+
+
+    @ExcelProperty(value = "跟进方式", converter = DictConvert.class)
+    @DictFormat("customer_followup_method")
     @ApiModelProperty(value = "跟进方式 字典customer_followup_method")
     private Integer followMethod;
 
-    @ExcelProperty("客户经理/跟进业务员id")
-    @ApiModelProperty(value = "客户经理/跟进业务员id")
-    private Long followUserId;
 
     @ExcelProperty("目的")
     @ApiModelProperty(value = "目的")
     private String purpose;
 
-    @ExcelProperty("跟进结果 字典customer_followup_result_type")
+    @ExcelProperty("跟进情况")
+    @ApiModelProperty(value = "客户反馈")
+    private String feedback;
+
+    @ExcelProperty(value = "跟进结果", converter = DictConvert.class)
+    @DictFormat("customer_followup_result_type")
     @ApiModelProperty(value = "跟进结果 字典customer_followup_result_type")
     private Integer resultType;
 
-    @ExcelProperty("客户反馈")
-    @ApiModelProperty(value = "客户反馈")
-    private String feedback;
 
-    @ExcelProperty("附件 多个以逗号分隔")
-    @ApiModelProperty(value = "附件 多个以逗号分隔")
-    private String attatchment;
 
     @ExcelProperty("下次跟进时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "下次跟进时间")
     private Date nextTime;
 
+    @ExcelProperty("关联跟进纪录")
+    @ApiModelProperty(value = "上一级跟进单号")
+    private String parentNumber;
+
     @ExcelProperty("下次跟进计划")
     @ApiModelProperty(value = "下次跟进计划")
     private String nextPlan;
 
+
+
+
+    @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;
 
 
-    @ApiModelProperty(value = "客户编号")
-    private String customerNumber;
-    @ApiModelProperty(value = "报价单编号")
-    private String offerNumber;
-    //creator_name
-    @ApiModelProperty(value = "创建人名称")
-    private String creatorName;
     // updater_name
+    @ExcelProperty("最后更新人")
     @ApiModelProperty(value = "更新人名称")
     private String updaterName;
 
 
+    @ExcelProperty("最后更新时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+
 }

yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/listener/CustomerFollowupExcelExportListener.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.customer.convert.customerFollowup.CustomerFollowu
 import cn.iocoder.yudao.module.customer.dal.dataobject.customerFollowup.CustomerFollowupDO;
 import cn.iocoder.yudao.module.customer.service.customerFollowup.CustomerFollowupService;
 import cn.iocoder.yudao.module.customer.vo.customerFollowup.CustomerFollowupBackVO;
+import cn.iocoder.yudao.module.customer.vo.customerFollowup.CustomerFollowupExcelVO;
 import cn.iocoder.yudao.module.customer.vo.customerFollowup.CustomerFollowupQueryVO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
@@ -75,9 +76,9 @@ public class CustomerFollowupExcelExportListener {
 
 
                 // 导出 Excel
-                List<CustomerFollowupBackVO> datas = CustomerFollowupConvert.INSTANCE.convertList(customerFollowupDOList);
+                List<CustomerFollowupExcelVO> datas = CustomerFollowupConvert.INSTANCE.convertList2(customerFollowupDOList);
 
-                String path = ExcelUtils.write(dir, fileName, "数据", CustomerFollowupBackVO.class, datas);
+                String path = ExcelUtils.write(dir, fileName, "数据", CustomerFollowupExcelVO.class, datas);
 
                 // 获取到临时文件
                 File file = new File(path);