From f02d0df2f1dfc7a8b775cf50d45375e57628a5ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 11:26:22 +0800
Subject: [PATCH] feat(ncr): 完善NCR处置联动逻辑与关闭校验
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java
index acc167e..b73414f 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java
@@ -3,11 +3,13 @@
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
import cn.iocoder.yudao.module.infra.enums.DictTypeConstants;
+import cn.iocoder.yudao.module.crm.framework.excel.core.AutoPoolEnabledConvert;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
@Schema(description = "绠＄悊鍚庡彴 - CRM 瀹㈡埛 Response VO")
@@ -36,6 +38,10 @@
@ExcelProperty("鏈�鍚庤窡杩涘唴瀹�")
private String contactLastContent;
+ @Schema(description = "鏈�鏂版唇璋堣繘搴︼紙鍙栬嚜 crm_customer_progress 鏈�鏂颁竴鏉★級", example = "瀹㈡埛纭鎶ヤ环锛岀瓑寰呭唴閮ㄥ鎵�")
+ @ExcelProperty("娲借皥杩涘害")
+ private String negotiationProgress;
+
@Schema(description = "涓嬫鑱旂郴鏃堕棿")
@ExcelProperty("涓嬫鑱旂郴鏃堕棿")
private LocalDateTime contactNextTime;
@@ -59,6 +65,10 @@
@ExcelProperty(value = "鎴愪氦鐘舵��", converter = DictConvert.class)
@DictFormat(DictTypeConstants.BOOLEAN_STRING)
private Boolean dealStatus;
+
+ @Schema(description = "鏄惁娴佸叆鍏捣")
+ @ExcelProperty(value = "鏄惁娴佸叆鍏捣", converter = AutoPoolEnabledConvert.class)
+ private Boolean autoPoolEnabled;
@Schema(description = "鎵嬫満", example = "25682")
@ExcelProperty("鎵嬫満")
@@ -127,4 +137,12 @@
@Schema(description = "璺濈鍔犲叆鍏捣鏃堕棿", example = "1")
private Long poolDay;
+ // ========== 绛捐鍚堝悓锛堢敱 crm_contract 鐨勫鏍搁�氳繃鍚堝悓瀹炴椂缁熻锛岄潪瀹㈡埛琛ㄥ瓧娈碉級 ==========
+
+ @Schema(description = "宸茬璁㈠悎鍚屾暟閲忥紙瀹℃壒鐘舵�佷负瀹℃牳閫氳繃锛夛紝娌℃湁鍒欎负 0", example = "2")
+ private Integer contractCount;
+
+ @Schema(description = "宸茬璁㈠悎鍚岄噾棰濆悎璁★紙瀹℃壒鐘舵�佷负瀹℃牳閫氳繃锛夛紝娌℃湁鍒欎负 null", example = "3235289.45")
+ private BigDecimal contractTotalPrice;
+
}
--
Gitblit v1.9.3