feat: add business title fields

WangXu10 · WangXu10 · commit 33aef9ee8c3b · 2026-02-24T11:52:06.000+08:00
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/domain/BusinessTitle.java b/backend/crm/src/main/java/cn/cordys/crm/contract/domain/BusinessTitle.java
@@ -48,4 +48,13 @@ public class BusinessTitle extends BaseModel {
 
     @Schema(description = "组织id")
     private String organizationId;
+
+    @Schema(description = "所属地区")
+    private String area;
+
+    @Schema(description = "企业规模")
+    private String scale;
+
+    @Schema(description = "国标行业")
+    private String industry;
 }
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/dto/request/BusinessTitleAddRequest.java b/backend/crm/src/main/java/cn/cordys/crm/contract/dto/request/BusinessTitleAddRequest.java
@@ -46,4 +46,16 @@ public class BusinessTitleAddRequest {
     @Schema(description = "来源类型(自定义(CUSTOM)/三方(THIRD_PARTY))")
     private String type;
 
+    @Size(max = 255)
+    @Schema(description = "所属地区")
+    private String area;
+
+    @Size(max = 255)
+    @Schema(description = "企业规模")
+    private String scale;
+
+    @Size(max = 255)
+    @Schema(description = "国标行业")
+    private String industry;
+
 }
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/excel/constants/BusinessTitleImportFiled.java b/backend/crm/src/main/java/cn/cordys/crm/contract/excel/constants/BusinessTitleImportFiled.java
@@ -20,7 +20,10 @@ public enum BusinessTitleImportFiled {
     PHONE_NUMBER("phoneNumber", "注册电话", "Phone number", BusinessTitleExcelData::getPhoneNumber),
     REGISTERED_CAPITAL("registeredCapital", "注册资本", "Registered capital", BusinessTitleExcelData::getRegisteredCapital),
     COMPANY_SIZE("companySize", "公司规模", "Customer size", BusinessTitleExcelData::getCompanySize),
-    registration_number("registrationNumber", "工商注册账号", "Registration number", BusinessTitleExcelData::getRegistrationNumber);
+    registration_number("registrationNumber", "工商注册账号", "Registration number", BusinessTitleExcelData::getRegistrationNumber),
+    AREA("area", "所属地区", "Area", BusinessTitleExcelData::getArea),
+    Scale("scale", "企业规模", "Scale", BusinessTitleExcelData::getScale),
+    INDUSTRY("industry", "国标行业", "Industry", BusinessTitleExcelData::getIndustry);
 
     @Getter
     private final Map<Locale, String> filedLangMap;
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/excel/domain/BusinessTitleExcelData.java b/backend/crm/src/main/java/cn/cordys/crm/contract/excel/domain/BusinessTitleExcelData.java
@@ -59,6 +59,21 @@ public class BusinessTitleExcelData {
      */
     @ExcelIgnore
     private String registrationNumber;
+    /**
+     * 所属地区
+     */
+    @ExcelIgnore
+    private String area;
+    /**
+     * 企业规模
+     */
+    @ExcelIgnore
+    private String scale;
+    /**
+     * 国标行业
+     */
+    @ExcelIgnore
+    private String industry;
 
 
     public List<List<String>> getHead() {
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/excel/domain/BusinessTitleExcelDataCn.java b/backend/crm/src/main/java/cn/cordys/crm/contract/excel/domain/BusinessTitleExcelDataCn.java
@@ -1,5 +1,6 @@
 package cn.cordys.crm.contract.excel.domain;
 
+import cn.idev.excel.annotation.ExcelIgnore;
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.idev.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
@@ -66,6 +67,24 @@ public class BusinessTitleExcelDataCn extends BusinessTitleExcelData {
     @ColumnWidth(255)
     @ExcelProperty("工商注册账号")
     private String registrationNumber;
+    /**
+     * 所属地区
+     */
+    @ColumnWidth(255)
+    @ExcelProperty("所属地区")
+    private String area;
+    /**
+     * 企业规模
+     */
+    @ColumnWidth(255)
+    @ExcelProperty("企业规模")
+    private String scale;
+    /**
+     * 国标行业
+     */
+    @ColumnWidth(255)
+    @ExcelProperty("国标行业")
+    private String industry;
 
 
     @Override
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/excel/domain/BusinessTitleExcelDataUs.java b/backend/crm/src/main/java/cn/cordys/crm/contract/excel/domain/BusinessTitleExcelDataUs.java
@@ -66,6 +66,24 @@ public class BusinessTitleExcelDataUs extends BusinessTitleExcelData {
     @ColumnWidth(255)
     @ExcelProperty("Registration number")
     private String registrationNumber;
+    /**
+     * 所属地区
+     */
+    @ColumnWidth(255)
+    @ExcelProperty("Area")
+    private String area;
+    /**
+     * 企业规模
+     */
+    @ColumnWidth(255)
+    @ExcelProperty("Scale")
+    private String scale;
+    /**
+     * 国标行业
+     */
+    @ColumnWidth(255)
+    @ExcelProperty("Industry")
+    private String industry;
 
     @Override
     public List<List<String>> getHead() {
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/service/BusinessTitleExportService.java b/backend/crm/src/main/java/cn/cordys/crm/contract/service/BusinessTitleExportService.java
@@ -77,6 +77,10 @@ public LinkedHashMap<String, Object> getSystemFieldMap(BusinessTitleListResponse
         systemFieldMap.put("companySize", data.getCompanySize());
         systemFieldMap.put("registrationNumber", data.getRegistrationNumber());
         systemFieldMap.put("unapprovedReason", data.getUnapprovedReason());
+        systemFieldMap.put("area", data.getArea());
+        systemFieldMap.put("scale", data.getScale());
+        systemFieldMap.put("industry", data.getIndustry());
+
 
         systemFieldMap.put("createUser", data.getCreateUserName());
         systemFieldMap.put("createTime", TimeUtils.getDateTimeStr(data.getCreateTime()));
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/service/BusinessTitleService.java b/backend/crm/src/main/java/cn/cordys/crm/contract/service/BusinessTitleService.java
@@ -18,7 +18,9 @@
 import cn.cordys.common.util.Translator;
 import cn.cordys.crm.contract.constants.BusinessTitleType;
 import cn.cordys.crm.contract.constants.ContractApprovalStatus;
-import cn.cordys.crm.contract.domain.*;
+import cn.cordys.crm.contract.domain.BusinessTitle;
+import cn.cordys.crm.contract.domain.BusinessTitleConfig;
+import cn.cordys.crm.contract.domain.ContractInvoice;
 import cn.cordys.crm.contract.dto.request.BusinessTitleAddRequest;
 import cn.cordys.crm.contract.dto.request.BusinessTitleApprovalRequest;
 import cn.cordys.crm.contract.dto.request.BusinessTitlePageRequest;
@@ -35,7 +37,6 @@
 import cn.cordys.crm.integration.qcc.constant.QccApiPaths;
 import cn.cordys.crm.integration.qcc.dto.*;
 import cn.cordys.crm.opportunity.constants.ApprovalState;
-import cn.cordys.crm.opportunity.domain.OpportunityQuotation;
 import cn.cordys.crm.system.constants.SheetKey;
 import cn.cordys.crm.system.dto.field.base.BaseField;
 import cn.cordys.crm.system.dto.response.ImportResponse;
@@ -451,6 +452,15 @@ private BusinessTitle buildBusinessTitle(EnterpriseInfo enterpriseInfo) {
             businessTitle.setRegisteredCapital(data.getRegisterCapi());
             businessTitle.setCompanySize(data.getPersonScope());
             businessTitle.setRegistrationNumber(data.getNo());
+            if (data.getArea() != null) {
+                String province = data.getArea().getProvince();
+                String city = data.getArea().getCity();
+                businessTitle.setArea(StringUtils.isNotBlank(province) && StringUtils.isNotBlank(city) ? province + "/" + city : province + city);
+            }
+            businessTitle.setScale(data.getScale());
+            if (data.getIndustry() != null) {
+                businessTitle.setIndustry(data.getIndustry().getSubIndustry());
+            }
         }
         return businessTitle;
     }
@@ -538,29 +548,30 @@ public String getBusinessTitleName(String string) {
         return Optional.ofNullable(businessTitle).map(BusinessTitle::getName).orElse(null);
     }
 
-	/**
-	 * 通过名称获取工商表头集合
-	 *
-	 * @param names 名称
-	 * @return 工商表头集合
-	 */
-	public List<BusinessTitle> getBusinessTitleListByNames(List<String> names) {
-		LambdaQueryWrapper<BusinessTitle> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.in(BusinessTitle::getName, names);
-		return businessTitleMapper.selectListByLambda(lambdaQueryWrapper);
-	}
-
-	/**
-	 * 通过ID集合获取工商表头名称
-	 * @param ids id集合
-	 * @return 工商表头名称
-	 */
-	public String getTitleNameByIds(List<String> ids) {
-		List<BusinessTitle> titles = businessTitleMapper.selectByIds(ids);
-		if (CollectionUtils.isNotEmpty(titles)) {
-			List<String> names = titles.stream().map(BusinessTitle::getName).toList();
-			return String.join(",", names);
-		}
-		return StringUtils.EMPTY;
-	}
+    /**
+     * 通过名称获取工商表头集合
+     *
+     * @param names 名称
+     * @return 工商表头集合
+     */
+    public List<BusinessTitle> getBusinessTitleListByNames(List<String> names) {
+        LambdaQueryWrapper<BusinessTitle> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(BusinessTitle::getName, names);
+        return businessTitleMapper.selectListByLambda(lambdaQueryWrapper);
+    }
+
+    /**
+     * 通过ID集合获取工商表头名称
+     *
+     * @param ids id集合
+     * @return 工商表头名称
+     */
+    public String getTitleNameByIds(List<String> ids) {
+        List<BusinessTitle> titles = businessTitleMapper.selectByIds(ids);
+        if (CollectionUtils.isNotEmpty(titles)) {
+            List<String> names = titles.stream().map(BusinessTitle::getName).toList();
+            return String.join(",", names);
+        }
+        return StringUtils.EMPTY;
+    }
 }
diff --git a/backend/crm/src/main/java/cn/cordys/crm/integration/qcc/dto/Area.java b/backend/crm/src/main/java/cn/cordys/crm/integration/qcc/dto/Area.java
@@ -0,0 +1,20 @@
+package cn.cordys.crm.integration.qcc.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class Area {
+
+    /**
+     * 省份
+     */
+    @JsonProperty("Province")
+    private String province;
+
+    /**
+     * 城市
+     */
+    @JsonProperty("City")
+    private String city;
+}
diff --git a/backend/crm/src/main/java/cn/cordys/crm/integration/qcc/dto/Industry.java b/backend/crm/src/main/java/cn/cordys/crm/integration/qcc/dto/Industry.java
@@ -0,0 +1,14 @@
+package cn.cordys.crm.integration.qcc.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class Industry {
+
+    /**
+     * 行业大类描述
+     */
+    @JsonProperty("SubIndustry")
+    private String subIndustry;
+}
diff --git a/backend/crm/src/main/java/cn/cordys/crm/integration/qcc/dto/InfoData.java b/backend/crm/src/main/java/cn/cordys/crm/integration/qcc/dto/InfoData.java
@@ -58,5 +58,23 @@ public class InfoData {
      */
     @JsonProperty("No")
     private String no;
+
+    /**
+     * 所属地区
+     */
+    @JsonProperty("Area")
+    private Area area;
+
+    /**
+     * 企业规模
+     */
+    @JsonProperty("Scale")
+    private String scale;
+
+    /**
+     * 国标行业
+     */
+    @JsonProperty("Industry")
+    private Industry industry;
 }
 
diff --git a/backend/crm/src/main/resources/migration/1.5.2/ddl/V1.5.2_1__init.sql b/backend/crm/src/main/resources/migration/1.5.2/ddl/V1.5.2_1__init.sql
@@ -0,0 +1 @@
+select database();
diff --git a/backend/crm/src/main/resources/migration/1.5.2/ddl/V1.5.2_2__ga_ddl.sql b/backend/crm/src/main/resources/migration/1.5.2/ddl/V1.5.2_2__ga_ddl.sql
@@ -0,0 +1,14 @@
+-- set innodb lock wait timeout
+SET SESSION innodb_lock_wait_timeout = 7200;
+
+ALTER TABLE business_title
+    ADD `area` VARCHAR(255) COMMENT '所属地区';
+
+ALTER TABLE business_title
+    ADD `scale` VARCHAR(255) COMMENT '企业规模';
+
+ALTER TABLE business_title
+    ADD `industry` VARCHAR(255) COMMENT '国标行业';
+
+-- set innodb lock wait timeout to default
+SET SESSION innodb_lock_wait_timeout = DEFAULT;
diff --git a/backend/crm/src/main/resources/migration/1.5.2/dml/V1.5.2_2_1__data.sql b/backend/crm/src/main/resources/migration/1.5.2/dml/V1.5.2_2_1__data.sql
@@ -0,0 +1,9 @@
+-- set innodb lock wait timeout
+SET SESSION innodb_lock_wait_timeout = 7200;
+
+INSERT INTO business_title_config (id, field, required, organization_id)
+VALUES (UUID_SHORT(), 'area', false, '100001'),
+       (UUID_SHORT(), 'scale', false, '100001'),
+       (UUID_SHORT(), 'industry', false, '100001');
+
+SET SESSION innodb_lock_wait_timeout = DEFAULT;
