diff --git a/backend/crm/src/main/java/io/cordys/common/constants/BusinessModuleField.java b/backend/crm/src/main/java/io/cordys/common/constants/BusinessModuleField.java index 14053bd06..620cf2373 100644 --- a/backend/crm/src/main/java/io/cordys/common/constants/BusinessModuleField.java +++ b/backend/crm/src/main/java/io/cordys/common/constants/BusinessModuleField.java @@ -5,7 +5,7 @@ import lombok.Getter; import java.util.Set; /** - * 业务模块字段(定义在主表中,有特定业务含义) + * 业务模块字段(定义在主表中,有特定业务含义)(标准字段) * @Author: jianxing * @CreateTime: 2025-02-18 17:27 */ @@ -28,15 +28,15 @@ public enum BusinessModuleField { /** * 联系人客户id */ - CUSTOMER_CONTACT_CUSTOMER("customerContactCustomer", "customerId"), + CUSTOMER_CONTACT_CUSTOMER("contactCustomer", "customerId"), /** * 联系人名称 */ - CUSTOMER_CONTACT_NAME("customerContactName", "name", Set.of("rules")), + CUSTOMER_CONTACT_NAME("contactName", "name", Set.of("rules")), /** * 联系人电话 */ - CUSTOMER_CONTACT_PHONE("customerContactPhone", "phone"), + CUSTOMER_CONTACT_PHONE("contactPhone", "phone"), /*------ end: CUSTOMER_MANAGEMENT_CONTACT ------*/ @@ -44,27 +44,27 @@ public enum BusinessModuleField { /** * 客户id */ - FOLLOW_RECORD_CUSTOMER("followRecordCustomerId", "customerId"), + FOLLOW_RECORD_CUSTOMER("recordCustomer", "customerId"), /** * 商机id */ - FOLLOW_RECORD_OPPORTUNITY("followRecordOpportunityId", "opportunityId"), + FOLLOW_RECORD_OPPORTUNITY("recordOpportunity", "opportunityId"), /** * 线索id */ - FOLLOW_RECORD_CLUE("followRecordClueId", "clueId"), + FOLLOW_RECORD_CLUE("recordClue", "clueId"), /** * 责任人id */ - FOLLOW_RECORD_OWNER("followRecordOwner", "owner"), + FOLLOW_RECORD_OWNER("recordOwner", "owner"), /** * 联系人id */ - FOLLOW_RECORD_CONTACT("followRecordContactId", "contactId"); + FOLLOW_RECORD_CONTACT("recordContact", "contactId"); /*------ end: FOLLOW_UP_RECORD ------*/ /** - * 字段 key + * 字段 key,field.json 中的 internalKey */ private final String key; /** diff --git a/backend/crm/src/main/java/io/cordys/common/constants/FormKey.java b/backend/crm/src/main/java/io/cordys/common/constants/FormKey.java index cfe71051d..e7ce19ced 100644 --- a/backend/crm/src/main/java/io/cordys/common/constants/FormKey.java +++ b/backend/crm/src/main/java/io/cordys/common/constants/FormKey.java @@ -28,7 +28,7 @@ public enum FormKey { /** * 商机 */ - BUSINESS("business"), + OPPORTUNITY("opportunity"), /** * 产品 */ diff --git a/backend/crm/src/main/java/io/cordys/crm/opportunity/controller/OpportunityController.java b/backend/crm/src/main/java/io/cordys/crm/opportunity/controller/OpportunityController.java index e1fe21f1d..60f9425fd 100644 --- a/backend/crm/src/main/java/io/cordys/crm/opportunity/controller/OpportunityController.java +++ b/backend/crm/src/main/java/io/cordys/crm/opportunity/controller/OpportunityController.java @@ -44,7 +44,7 @@ public class OpportunityController { @RequiresPermissions(PermissionConstants.OPPORTUNITY_MANAGEMENT_READ) @Operation(summary = "获取表单配置") public ModuleFormConfigDTO getModuleFormConfig() { - return moduleFormService.getConfig(FormKey.BUSINESS.getKey(), OrganizationContext.getOrganizationId()); + return moduleFormService.getConfig(FormKey.OPPORTUNITY.getKey(), OrganizationContext.getOrganizationId()); } diff --git a/backend/crm/src/main/java/io/cordys/crm/opportunity/service/OpportunityFieldService.java b/backend/crm/src/main/java/io/cordys/crm/opportunity/service/OpportunityFieldService.java index 0c81eb136..f7ae85701 100644 --- a/backend/crm/src/main/java/io/cordys/crm/opportunity/service/OpportunityFieldService.java +++ b/backend/crm/src/main/java/io/cordys/crm/opportunity/service/OpportunityFieldService.java @@ -20,7 +20,7 @@ public class OpportunityFieldService extends BaseResourceFieldService