From 9fceeaad9af96bc58ba714560814c6e94f8af406 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 10 八月 2026 17:13:01 +0800
Subject: [PATCH] feat(crm): 增强合同开票与回款功能
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java | 93 ++++++++++++++++++++++++++++------------------
1 files changed, 56 insertions(+), 37 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
index 307a747..e9acd92 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
@@ -17,111 +17,126 @@
public class CrmContractRespVO {
@Schema(description = "鍚堝悓缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
- @ExcelProperty("鍚堝悓缂栧彿")
private Long id;
@Schema(description = "鍚堝悓鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐜嬩簲")
- @ExcelProperty("鍚堝悓鍚嶇О")
+ @ExcelProperty(value = "鍚堝悓鍚嶇О", index = 1)
private String name;
@Schema(description = "鍚堝悓缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230101")
- @ExcelProperty("鍚堝悓缂栧彿")
+ @ExcelProperty(value = "鍚堝悓缂栧彿", index = 0)
private String no;
@Schema(description = "瀹㈡埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "18336")
- @ExcelProperty("瀹㈡埛缂栧彿")
private Long customerId;
@Schema(description = "瀹㈡埛鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "18336")
- @ExcelProperty("瀹㈡埛鍚嶇О")
+ @ExcelProperty(value = "瀹㈡埛鍚嶇О", index = 2)
private String customerName;
@Schema(description = "鍟嗘満缂栧彿", example = "10864")
- @ExcelProperty("鍟嗘満缂栧彿")
private Long businessId;
@Schema(description = "鍟嗘満鍚嶇О", example = "10864")
- @ExcelProperty("鍟嗘満鍚嶇О")
+ @ExcelProperty(value = "鍟嗘満鍚嶇О", index = 3)
private String businessName;
@Schema(description = "鏈�鍚庤窡杩涙椂闂�")
- @ExcelProperty("鏈�鍚庤窡杩涙椂闂�")
+ @ExcelProperty(value = "鏈�鍚庤窡杩涙椂闂�", index = 14)
private LocalDateTime contactLastTime;
@Schema(description = "璐熻矗浜虹殑鐢ㄦ埛缂栧彿", example = "25682")
- @ExcelProperty("璐熻矗浜虹殑鐢ㄦ埛缂栧彿")
private Long ownerUserId;
@Schema(description = "璐熻矗浜哄悕瀛�", example = "25682")
- @ExcelProperty("璐熻矗浜哄悕瀛�")
+ @ExcelProperty(value = "璐熻矗浜�", index = 15)
private String ownerUserName;
@Schema(description = "璐熻矗浜洪儴闂�")
- @ExcelProperty("璐熻矗浜洪儴闂�")
+ @ExcelProperty(value = "鎵�灞為儴闂�", index = 16)
private String ownerUserDeptName;
@Schema(description = "宸ヤ綔娴佺紪鍙�", example = "1043")
- @ExcelProperty("宸ヤ綔娴佺紪鍙�")
private String processInstanceId;
@Schema(description = "瀹℃壒鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
- @ExcelProperty("瀹℃壒鐘舵��")
private Integer auditStatus;
+ @Schema(description = "鍚堝悓鐘舵�佸悕绉�", example = "瀹℃壒涓�")
+ @ExcelProperty(value = "鍚堝悓鐘舵��", index = 20)
+ private String auditStatusName;
+
@Schema(description = "涓嬪崟鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("涓嬪崟鏃ユ湡")
+ @ExcelProperty(value = "涓嬪崟鏃堕棿", index = 6)
private LocalDateTime orderDate;
@Schema(description = "寮�濮嬫椂闂�")
- @ExcelProperty("寮�濮嬫椂闂�")
+ @ExcelProperty(value = "鍚堝悓寮�濮嬫椂闂�", index = 7)
private LocalDateTime startTime;
@Schema(description = "缁撴潫鏃堕棿")
- @ExcelProperty("缁撴潫鏃堕棿")
+ @ExcelProperty(value = "鍚堝悓缁撴潫鏃堕棿", index = 8)
private LocalDateTime endTime;
@Schema(description = "浜у搧鎬婚噾棰�", example = "19510")
- @ExcelProperty("浜у搧鎬婚噾棰�")
private BigDecimal totalProductPrice;
@Schema(description = "鏁村崟鎶樻墸")
- @ExcelProperty("鏁村崟鎶樻墸")
private BigDecimal discountPercent;
@Schema(description = "鍚堝悓閲戦", example = "5617")
- @ExcelProperty("鍚堝悓閲戦")
+ @ExcelProperty(value = "鍚堝悓閲戦锛堝厓锛�", index = 4)
private BigDecimal totalPrice;
+ @Schema(description = "瀹氶噾閲戦锛屽崟浣嶏細鍏�", example = "1000.00")
+ @ExcelProperty(value = "瀹氶噾閲戦锛堝厓锛�", index = 5)
+ private BigDecimal depositPrice;
+
@Schema(description = "宸插洖娆鹃噾棰�", example = "5617")
- @ExcelProperty("宸插洖娆鹃噾棰�")
+ @ExcelProperty(value = "宸插洖娆鹃噾棰濓紙鍏冿級", index = 12)
private BigDecimal totalReceivablePrice;
+
+ @Schema(description = "鏈洖娆鹃噾棰濓紝绛変簬 鍚堝悓閲戦 - 宸插洖娆鹃噾棰�", example = "1000.00")
+ @ExcelProperty(value = "鏈洖娆鹃噾棰濓紙鍏冿級", index = 13)
+ private BigDecimal unReceivablePrice;
+
+ @Schema(description = "宸插紑绁ㄩ噾棰濓紙鍚鎵逛腑锛夛紝缁熻瀹℃壒閫氳繃 + 瀹℃壒涓殑寮�绁�", example = "5617")
+ private BigDecimal totalInvoicePrice;
+
+ @Schema(description = "鏈紑绁ㄩ噾棰濓紝绛変簬 鍚堝悓閲戦 - 宸插紑绁ㄩ噾棰�", example = "1000.00")
+ private BigDecimal unInvoicePrice;
+
+ @Schema(description = "鍏宠仈 ERP 閿�鍞鍗曠紪鍙�", example = "12345")
+ private Long orderId;
+ @Schema(description = "ERP 閿�鍞鍗曞崟鍙�", example = "SO001")
+ @ExcelProperty(value = "鍏宠仈璁㈠崟", index = 21)
+ private String orderNo;
@Schema(description = "瀹㈡埛绛剧害浜虹紪鍙�", example = "18546")
private Long signContactId;
@Schema(description = "瀹㈡埛绛剧害浜�", example = "灏忚眴")
- @ExcelProperty("瀹㈡埛绛剧害浜�")
+ @ExcelProperty(value = "瀹㈡埛绛剧害浜�", index = 9)
private String signContactName;
@Schema(description = "鍏徃绛剧害浜�", example = "14036")
private Long signUserId;
@Schema(description = "鍏徃绛剧害浜�", example = "灏忔槑")
- @ExcelProperty("鍏徃绛剧害浜�")
+ @ExcelProperty(value = "鍏徃绛剧害浜�", index = 10)
private String signUserName;
@Schema(description = "澶囨敞", example = "浣犵寽")
- @ExcelProperty("澶囨敞")
+ @ExcelProperty(value = "澶囨敞", index = 11)
private String remark;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("鍒涘缓鏃堕棿")
+ @ExcelProperty(value = "鍒涘缓鏃堕棿", index = 18)
private LocalDateTime createTime;
@Schema(description = "鍒涘缓浜�", example = "25682")
- @ExcelProperty("鍒涘缓浜�")
private String creator;
@Schema(description = "鍒涘缓浜哄悕瀛�", example = "test")
- @ExcelProperty("鍒涘缓浜哄悕瀛�")
+ @ExcelProperty(value = "鍒涘缓浜�", index = 19)
private String creatorName;
@Schema(description = "鏇存柊鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("鏇存柊鏃堕棿")
+ @ExcelProperty(value = "鏇存柊鏃堕棿", index = 17)
private LocalDateTime updateTime;
@Schema(description = "浜у搧鍒楄〃")
@@ -136,17 +151,21 @@
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "888")
private Long id;
- @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- private Long productId;
- @Schema(description = "浜у搧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鏉庡洓")
- private String productName;
- @Schema(description = "浜у搧鏉＄爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- private String productNo;
- @Schema(description = "浜у搧鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED, example = "鏉庡洓")
- private Integer productUnit;
+ @Schema(description = "MDM 鐗╂枡缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
+ private Long itemId;
+ @Schema(description = "鐗╂枡缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "ITEM001")
+ private String itemCode;
+ @Schema(description = "鐗╂枡鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐗╂枡A")
+ private String itemName;
+ @Schema(description = "鐗╂枡鏉＄爜", example = "BAR001")
+ private String itemBarCode;
+ @Schema(description = "璁￠噺鍗曚綅缂栧彿", example = "1")
+ private Long itemUnitId;
+ @Schema(description = "璁￠噺鍗曚綅鍚嶇О", example = "涓�")
+ private String itemUnitName;
- @Schema(description = "浜у搧鍗曚环", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- private BigDecimal productPrice;
+ @Schema(description = "鐗╂枡鍘熶环", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ private BigDecimal itemPrice;
@Schema(description = "鍚堝悓浠锋牸", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
private BigDecimal contractPrice;
--
Gitblit v1.9.3