From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contract/CrmContractDO.java | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contract/CrmContractDO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contract/CrmContractDO.java
index e7e3bae..bd1c08a 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contract/CrmContractDO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contract/CrmContractDO.java
@@ -67,17 +67,33 @@
private Long ownerUserId;
/**
- * 宸ヤ綔娴佺紪鍙�
- *
- * 鍏宠仈 ProcessInstance 鐨� id 灞炴��
- */
- private String processInstanceId;
- /**
* 瀹℃壒鐘舵��
+ *
+ * 鐢变笟鍔℃祦绋嬮┍鍔紝涓嶆帴鍙楀墠绔洿鎺ヨ祴鍊硷細鍒涘缓鏃跺浐瀹氫负鏈彁浜わ紝鎻愪氦瀹℃壒鍚庣疆涓哄鎵逛腑锛�
+ * 瀹℃牳閫氳繃 / 涓嶉�氳繃鐢� {@link cn.iocoder.yudao.module.crm.service.contract.CrmContractService#auditContract} 鎺ㄨ繘銆�
*
* 鏋氫妇 {@link CrmAuditStatusEnum}
*/
private Integer auditStatus;
+ /**
+ * 瀹℃牳浜虹敤鎴风紪鍙凤紙鎻愪氦瀹℃壒鏃剁敱鎻愪氦浜轰粠绯荤粺鐢ㄦ埛涓�夋嫨锛�
+ *
+ * 鍙湁璇ョ敤鎴疯兘鍦ㄥ垪琛ㄩ〉鐪嬪埌銆屽鏍搞�嶆寜閽苟鎵ц瀹℃牳鎿嶄綔銆�
+ * 鍏宠仈 AdminUserDO 鐨� id 瀛楁
+ */
+ private Long reviewerId;
+ /**
+ * 瀹℃牳浜哄鍚嶏紙鎻愪氦瀹℃壒鏃跺啑浣欒褰曪紝閬垮厤鍒楄〃灞曠ず鏃跺啀鏌ョ敤鎴凤級
+ */
+ private String reviewerName;
+ /**
+ * 瀹℃牳鏃堕棿
+ */
+ private LocalDateTime reviewTime;
+ /**
+ * 瀹℃牳鎰忚锛堝鏍搁�氳繃鏃剁殑鎰忚 / 瀹℃牳涓嶉�氳繃鏃剁殑鍘熷洜锛�
+ */
+ private String reviewRemark;
/**
* 涓嬪崟鏃ユ湡
@@ -104,6 +120,10 @@
*/
private BigDecimal totalPrice;
/**
+ * 瀹氶噾閲戦锛屽崟浣嶏細鍏�
+ */
+ private BigDecimal depositPrice;
+ /**
* 鍏宠仈 ERP 閿�鍞鍗曠紪鍙�
*/
private Long orderId;
@@ -128,4 +148,43 @@
*/
private String remark;
+ /**
+ * 鍚堝悓绫诲瀷锛堢數鍔汣RM鎵╁睍锛�
+ *
+ * 瀛楀吀 crm_contract_type锛歱ower=渚涚敤鐢靛悎鍚� / energy=鑳芥簮鏈嶅姟鍚堝悓 / resident=灞呴厤鍚堝悓 / solar=鍏変紡鍚堝悓
+ */
+ private String contractType;
+ /**
+ * 鐢靛帇绛夌骇
+ *
+ * 瀛楀吀 crm_voltage_level
+ */
+ private String voltageLevel;
+ /**
+ * 鐢ㄧ數绫诲瀷
+ *
+ * 瀛楀吀 crm_electricity_type
+ */
+ private String electricityType;
+ /**
+ * 鍚堝悓瀹归噺锛坘VA锛�
+ */
+ private BigDecimal contractCapacity;
+ /**
+ * 鐢典环妯″紡
+ *
+ * 瀛楀吀 crm_tariff_mode
+ */
+ private String tariffMode;
+ /**
+ * 璁￠噺鏂瑰紡
+ *
+ * 瀛楀吀 crm_meter_mode
+ */
+ private String meterMode;
+ /**
+ * 缂磋垂鍛ㄦ湡锛堟湀锛�
+ */
+ private Integer payCycle;
+
}
--
Gitblit v1.9.3