补充销售阶段字段及字典脚本，补充跟进类型字典值

sql/v2.1/20241126.sql

@@ -16,4 +16,7 @@ INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`,
 INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (2, '新业务开发', '2', 'sale_stage', 0, 'default', '', '新业务开发', '2702', '2024-11-26 18:34:51', '2702', '2024-11-26 18:48:25', b'0', 'new business development');
 INSERT INTO `system_dict_data`(`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `label_en`) VALUES (1, '新询盘', '1', 'sale_stage', 0, 'default', '', '新询盘', '2702', '2024-11-26 18:34:26', '2702', '2024-11-26 18:48:39', b'0', 'New inquiry');
 
+-- 补充跟进记录的销售阶段字段值
+alter table ecw_customer_followup
+    add COLUMN  `sale_stage` int DEFAULT NULL COMMENT '跟进销售阶段：详情看字典类型sale_stage' after `follow_type`;
 

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/dataobject/customerFollowup/CustomerFollowupDO.java

@@ -54,6 +54,10 @@ public class CustomerFollowupDO extends BaseDO {
      * 跟进类型 字典customer_followup_type
      */
     private Integer followType;
+    /**
+     * 销售阶段 字典sale_stage
+     */
+    private Integer saleStage;
     /**
      * 跟进时间
      */

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/mysql/customerFollowup/CustomerFollowupMapper.java

@@ -36,6 +36,7 @@ public interface CustomerFollowupMapper extends AbstractMapper<CustomerFollowupD
                 .eqIfPresent(CustomerFollowupDO::getCustomerId, vo.getCustomerId())
                 .eqIfPresent(CustomerFollowupDO::getOfferId, vo.getOfferId())
                 .eqIfPresent(CustomerFollowupDO::getFollowType, vo.getFollowType())
+                .eqIfPresent(CustomerFollowupDO::getSaleStage, vo.getSaleStage())
                 .betweenIfPresent(CustomerFollowupDO::getFollowTime, vo.getBeginFollowTime(), vo.getEndFollowTime())
                 .likeIfPresent(CustomerFollowupDO::getContactName, vo.getContactName())
                 .eqIfPresent(CustomerFollowupDO::getFollowMethod, vo.getFollowMethod())
@@ -64,6 +65,7 @@ public interface CustomerFollowupMapper extends AbstractMapper<CustomerFollowupD
                 .eqIfPresent(CustomerFollowupDO::getCustomerId, vo.getCustomerId())
                 .eqIfPresent(CustomerFollowupDO::getOfferId, vo.getOfferId())
                 .eqIfPresent(CustomerFollowupDO::getFollowType, vo.getFollowType())
+                .eqIfPresent(CustomerFollowupDO::getSaleStage, vo.getSaleStage())
                 .betweenIfPresent(CustomerFollowupDO::getFollowTime, vo.getBeginFollowTime(), vo.getEndFollowTime())
                 .likeIfPresent(CustomerFollowupDO::getContactName, vo.getContactName())
                 .eqIfPresent(CustomerFollowupDO::getFollowMethod, vo.getFollowMethod())

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/enums/ErrorCodeConstants.java

@@ -49,5 +49,6 @@ public interface ErrorCodeConstants {
     ErrorCode FOLLOWUP_FEEFBACK_NOT_NULL = new ErrorCode(1005001025, "请填写跟进情况");
     ErrorCode NEXT_FOLLOWUP_TIME_NOT_NULL = new ErrorCode(1005001026, "请选择下次跟进时间");
     ErrorCode NEXT_FOLLOWUP_PLAN_NOT_NULL = new ErrorCode(1005001027, "请填写下一步计划");
+    ErrorCode SALE_STAGE_NOT_NULL = new ErrorCode(1005001028, "请选择销售阶段");
 
 }

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customerFollowup/CustomerFollowupServiceImpl.java

@@ -174,6 +174,9 @@ public class CustomerFollowupServiceImpl extends AbstractService<CustomerFollowu
         if (Objects.isNull(followup.getFollowUserId())){
             throw exception(CUSTOMER_SERVICE_NOT_NULL);
         }
+        if (Objects.isNull(followup.getSaleStage())){
+            throw exception(SALE_STAGE_NOT_NULL);
+        }
         if (Objects.isNull(followup.getResultType())){
             throw exception(FOLLOWUP_RESULT_NOT_NULL);
         }

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

@@ -30,6 +30,11 @@ public class CustomerFollowupBackVO {
     @ApiModelProperty(value = "跟进类型 字典customer_followup_type")
     private Integer followType;
 
+    @ExcelProperty(value = "销售阶段", converter = DictConvert.class)
+    @DictFormat("sale_stage")
+    @ApiModelProperty(value = "销售阶段 字典sale_stage")
+    private Integer saleStage;
+
     @ApiModelProperty(value = "报价单")
     private Long offerId;
     @ExcelProperty("报价单")

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

@@ -33,6 +33,9 @@ public class CustomerFollowupBaseVO {
     @ApiModelProperty(value = "跟进类型 字典customer_followup_type")
     private Integer followType;
 
+    @ApiModelProperty(value = "销售阶段 字典sale_stage")
+    private Integer saleStage;
+
     @ApiModelProperty(value = "跟进时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private Date followTime;

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

@@ -43,6 +43,9 @@ public class CustomerFollowupQueryVO extends PageParam {
     @ApiModelProperty(value = "跟进类型 字典customer_followup_type")
     private Integer followType;
 
+    @ApiModelProperty(value = "销售阶段 字典sale_stage")
+    private Integer saleStage;
+
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始跟进时间")
     private Date beginFollowTime;