feat: business title import update

WangXu10 · fit2-zhao · commit 3fc1dcfa340c · 2026-03-30T11:30:23.000+08:00
--task=1021340@tapd-34675357 --user=王旭 【运营】工商抬头支持导入更新-后端 https://www.tapd.cn/34675357/s/1881746
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/controller/BusinessTitleController.java b/backend/crm/src/main/java/cn/cordys/crm/contract/controller/BusinessTitleController.java
@@ -157,16 +157,16 @@ public void downloadImportTpl(HttpServletResponse response) {
     @PostMapping("/import/pre-check")
     @Operation(summary = "excel导入检查")
     @RequiresPermissions(PermissionConstants.CONTRACT_BUSINESS_TITLE_IMPORT)
-    public ImportResponse preCheck(@RequestPart(value = "file", required = false) MultipartFile file) {
-        return businessTitleService.importPreCheck(file, OrganizationContext.getOrganizationId());
+    public ImportResponse preCheck(@RequestPart(value = "file", required = false) MultipartFile file, @Validated @RequestPart("request") BusinessTitleImportRequest request) {
+        return businessTitleService.importPreCheck(file, OrganizationContext.getOrganizationId(), request);
     }
 
 
     @PostMapping(value = "/import")
     @Operation(summary = "导入")
     @RequiresPermissions(PermissionConstants.CONTRACT_BUSINESS_TITLE_IMPORT)
-    public ImportResponse realImport(@RequestPart(value = "file", required = false) MultipartFile file) {
-        return businessTitleService.realImport(file, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
+    public ImportResponse realImport(@RequestPart(value = "file", required = false) MultipartFile file, @Validated @RequestPart("request") BusinessTitleImportRequest request) {
+        return businessTitleService.realImport(file, SessionUtils.getUserId(), OrganizationContext.getOrganizationId(), request);
     }
 
 
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
@@ -49,8 +49,11 @@ public class BusinessTitle extends BaseModel {
     @Schema(description = "组织id")
     private String organizationId;
 
-    @Schema(description = "所属地区")
-    private String area;
+    @Schema(description = "省")
+    private String province;
+
+    @Schema(description = "市")
+    private String city;
 
     @Schema(description = "企业规模")
     private String scale;
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
@@ -47,8 +47,12 @@ public class BusinessTitleAddRequest {
     private String type;
 
     @Size(max = 255)
-    @Schema(description = "所属地区")
-    private String area;
+    @Schema(description = "省")
+    private String province;
+
+    @Size(max = 255)
+    @Schema(description = "城")
+    private String city;
 
     @Size(max = 255)
     @Schema(description = "企业规模")
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/dto/request/BusinessTitleImportRequest.java b/backend/crm/src/main/java/cn/cordys/crm/contract/dto/request/BusinessTitleImportRequest.java
@@ -0,0 +1,13 @@
+package cn.cordys.crm.contract.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class BusinessTitleImportRequest {
+
+    @NotBlank
+    @Schema(description = "导入类型")
+    private String importType;
+}
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
@@ -21,7 +21,8 @@ public enum BusinessTitleImportFiled {
     REGISTERED_CAPITAL("registeredCapital", "注册资本", "Registered capital", BusinessTitleExcelData::getRegisteredCapital),
     COMPANY_SIZE("companySize", "公司规模", "Customer size", BusinessTitleExcelData::getCompanySize),
     registration_number("registrationNumber", "工商注册账号", "Registration number", BusinessTitleExcelData::getRegistrationNumber),
-    AREA("area", "所属地区", "Area", BusinessTitleExcelData::getArea),
+    PROVINCE("province", "省", "Province", BusinessTitleExcelData::getProvince),
+    CITY("city", "市", "City", BusinessTitleExcelData::getCity),
     Scale("scale", "企业规模", "Scale", BusinessTitleExcelData::getScale),
     INDUSTRY("industry", "国标行业", "Industry", BusinessTitleExcelData::getIndustry);
 
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/excel/constants/BusinessTitleImportType.java b/backend/crm/src/main/java/cn/cordys/crm/contract/excel/constants/BusinessTitleImportType.java
@@ -0,0 +1,13 @@
+package cn.cordys.crm.contract.excel.constants;
+
+public enum BusinessTitleImportType {
+    /**
+     * 新增
+     */
+    ADD,
+
+    /**
+     * 更新
+     */
+    UPDATE,
+}
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
@@ -60,10 +60,15 @@ public class BusinessTitleExcelData {
     @ExcelIgnore
     private String registrationNumber;
     /**
-     * 所属地区
+     * 省
      */
     @ExcelIgnore
-    private String area;
+    private String province;
+    /**
+     * 市
+     */
+    @ExcelIgnore
+    private String city;
     /**
      * 企业规模
      */
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
@@ -68,11 +68,17 @@ public class BusinessTitleExcelDataCn extends BusinessTitleExcelData {
     @ExcelProperty("工商注册账号")
     private String registrationNumber;
     /**
-     * 所属地区
+     * 省
      */
     @ColumnWidth(255)
-    @ExcelProperty("所属地区")
-    private String area;
+    @ExcelProperty("省")
+    private String province;
+    /**
+     * 市
+     */
+    @ColumnWidth(255)
+    @ExcelProperty("市")
+    private String city;
     /**
      * 企业规模
      */
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
@@ -67,11 +67,17 @@ public class BusinessTitleExcelDataUs extends BusinessTitleExcelData {
     @ExcelProperty("Registration number")
     private String registrationNumber;
     /**
-     * 所属地区
+     * 省
      */
     @ColumnWidth(255)
-    @ExcelProperty("Area")
-    private String area;
+    @ExcelProperty("Province")
+    private String province;
+    /**
+     * 市
+     */
+    @ColumnWidth(255)
+    @ExcelProperty("City")
+    private String city;
     /**
      * 企业规模
      */
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/excel/listener/BusinessTitleCheckEventListener.java b/backend/crm/src/main/java/cn/cordys/crm/contract/excel/listener/BusinessTitleCheckEventListener.java
@@ -4,14 +4,17 @@
 import cn.cordys.common.mapper.CommonMapper;
 import cn.cordys.common.util.CommonBeanFactory;
 import cn.cordys.common.util.Translator;
+import cn.cordys.crm.contract.dto.request.BusinessTitleImportRequest;
 import cn.cordys.crm.contract.excel.constants.BusinessTitleImportFiled;
+import cn.cordys.crm.contract.excel.constants.BusinessTitleImportType;
 import cn.cordys.excel.domain.ExcelErrData;
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.idev.excel.context.AnalysisContext;
 import cn.idev.excel.event.AnalysisEventListener;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -43,13 +46,15 @@ public class BusinessTitleCheckEventListener extends AnalysisEventListener<Map<I
     private final List<List<String>> heads;
     protected boolean atLeastOne = false;
     private final Map<String, Boolean> excelValueCache = new ConcurrentHashMap<>();
+    private BusinessTitleImportRequest request = new BusinessTitleImportRequest();
 
-    public BusinessTitleCheckEventListener(Class<?> clazz, Map<String, Boolean> requiredFieldMap, String orgId, List<List<String>> heads) {
+    public BusinessTitleCheckEventListener(Class<?> clazz, Map<String, Boolean> requiredFieldMap, String orgId, List<List<String>> heads, BusinessTitleImportRequest request) {
         this.excelDataClass = clazz;
         this.requiredFieldMap = requiredFieldMap;
         this.orgId = orgId;
         this.commonMapper = CommonBeanFactory.getBean(CommonMapper.class);
         this.heads = heads;
+        this.request = request;
     }
 
     @Override
@@ -98,9 +103,11 @@ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
     private void validateRowData(Integer rowIndex, Map<Integer, String> rowData) {
         StringBuilder errText = new StringBuilder();
         headMap.forEach((k, v) -> {
-            validateRequired(rowData.get(k), errText, v);
+            if (Strings.CI.equals(request.getImportType(), BusinessTitleImportType.ADD.name())) {
+                validateRequired(rowData.get(k), errText, v);
+                validateNameUniques(rowData.get(k), errText, v);
+            }
             validateLenLimit(rowData.get(k), errText, v);
-            validateNameUniques(rowData.get(k), errText, v);
         });
         if (StringUtils.isNotEmpty(errText)) {
             ExcelErrData excelErrData = new ExcelErrData(rowIndex,
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/excel/listener/BusinessTitleImportEventListener.java b/backend/crm/src/main/java/cn/cordys/crm/contract/excel/listener/BusinessTitleImportEventListener.java
@@ -3,6 +3,7 @@
 import cn.cordys.common.exception.GenericException;
 import cn.cordys.common.uid.IDGenerator;
 import cn.cordys.common.util.Translator;
+import cn.cordys.crm.contract.dto.request.BusinessTitleImportRequest;
 import cn.cordys.crm.contract.excel.constants.BusinessTitleImportFiled;
 import cn.cordys.excel.domain.ExcelErrData;
 import cn.idev.excel.context.AnalysisContext;
@@ -39,8 +40,8 @@ public class BusinessTitleImportEventListener<T> extends BusinessTitleCheckEvent
      */
     private final Class<T> entityClass;
 
-    public BusinessTitleImportEventListener(Class<?> clazz, Class<T> entityClass, Map<String, Boolean> requiredFieldMap, String orgId, String userId, Consumer<List<T>> consumer, List<List<String>> heads) {
-        super(clazz, requiredFieldMap, orgId, heads);
+    public BusinessTitleImportEventListener(Class<?> clazz, Class<T> entityClass, Map<String, Boolean> requiredFieldMap, String orgId, String userId, Consumer<List<T>> consumer, List<List<String>> heads, BusinessTitleImportRequest request) {
+        super(clazz, requiredFieldMap, orgId, heads, request);
         this.entityClass = entityClass;
         this.userId = userId;
         this.consumer = consumer;
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtBusinessTitleMapper.java b/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtBusinessTitleMapper.java
@@ -1,5 +1,6 @@
 package cn.cordys.crm.contract.mapper;
 
+import cn.cordys.crm.contract.domain.BusinessTitle;
 import cn.cordys.crm.contract.dto.request.BusinessTitlePageRequest;
 import cn.cordys.crm.contract.dto.response.BusinessTitleListResponse;
 import org.apache.ibatis.annotations.Param;
@@ -14,4 +15,8 @@ public interface ExtBusinessTitleMapper {
     List<BusinessTitleListResponse> getListByIds(@Param("ids") List<String> ids, @Param("userId") String userId, @Param("orgId") String orgId);
 
     int countByName(@Param("businessName") String businessName, @Param("orgId") String orgId, @Param("id") String id);
+
+    List<BusinessTitle> selectByNames(@Param("names")List<String> names);
+
+    void updateById(@Param("title") BusinessTitle title);
 }
diff --git a/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtBusinessTitleMapper.xml b/backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtBusinessTitleMapper.xml
@@ -5,11 +5,11 @@
 
     <select id="list" resultType="cn.cordys.crm.contract.dto.response.BusinessTitleListResponse">
         SELECT
-            bt.*
+        bt.*
         FROM
-            business_title bt
+        business_title bt
         WHERE
-            bt.organization_id = #{orgId}
+        bt.organization_id = #{orgId}
         <if test="request.keyword != null and request.keyword != ''">
             and bt.name like concat('%', #{request.keyword},'%')
         </if>
@@ -113,6 +113,30 @@
                     <property name="column" value="bt.unapproved_reason"/>
                 </include>
             </when>
+            <when test="condition.name == 'province'">
+                <include refid="cn.cordys.common.mapper.CommonMapper.condition">
+                    <property name="condition" value="condition"/>
+                    <property name="column" value="bt.province"/>
+                </include>
+            </when>
+            <when test="condition.name == 'city'">
+                <include refid="cn.cordys.common.mapper.CommonMapper.condition">
+                    <property name="condition" value="condition"/>
+                    <property name="column" value="bt.city"/>
+                </include>
+            </when>
+            <when test="condition.name == 'scale'">
+                <include refid="cn.cordys.common.mapper.CommonMapper.condition">
+                    <property name="condition" value="condition"/>
+                    <property name="column" value="bt.scale"/>
+                </include>
+            </when>
+            <when test="condition.name == 'industry'">
+                <include refid="cn.cordys.common.mapper.CommonMapper.condition">
+                    <property name="condition" value="condition"/>
+                    <property name="column" value="bt.industry"/>
+                </include>
+            </when>
             <when test="condition.name == 'createTime'">
                 <include refid="cn.cordys.common.mapper.CommonMapper.condition">
                     <property name="condition" value="condition"/>
@@ -160,13 +184,13 @@
     <sql id="sort">
         <choose>
             <when test="${sort} != null and ${sort}.valid()">
-                <bind name="sortType" value="${sort}.type" />
-                <bind name="sortName" value="${sort}.name" />
+                <bind name="sortType" value="${sort}.type"/>
+                <bind name="sortName" value="${sort}.name"/>
                 order by
                 <choose>
                     <when test="${sort}.name in
                         {'name', 'type', 'create_time', 'update_time', 'identification_number', 'opening_bank', 'create_user', 'update_user', 'bank_account', 'registration_address',
-                         'phone_number', 'registered_capital', 'company_size', 'registration_number', 'approval_status', 'unapproved_reason'
+                         'phone_number', 'registered_capital', 'company_size', 'registration_number', 'approval_status', 'unapproved_reason', 'province', 'city', 'scale', 'industry'
                         }">
                         bt.${sortName} ${sortType}, bt.id ASC
                     </when>
@@ -203,4 +227,59 @@
         </if>
     </select>
 
+
+    <select id="selectByNames" resultType="cn.cordys.crm.contract.domain.BusinessTitle">
+        select id, name from business_title
+        where name in
+        <foreach collection="names" item="name" open="(" close=")" separator=",">
+            #{name}
+        </foreach>
+    </select>
+
+
+    <update id="updateById">
+        update business_title
+        <set>
+            <if test="title.identificationNumber != null and title.identificationNumber != ''">
+                identification_number = #{title.identificationNumber},
+            </if>
+            <if test="title.openingBank != null and title.openingBank != ''">
+                opening_bank = #{title.openingBank},
+            </if>
+            <if test="title.bankAccount != null and title.bankAccount != ''">
+                bank_account = #{title.bankAccount},
+            </if>
+            <if test="title.registrationAddress != null and title.registrationAddress != ''">
+                registration_address = #{title.registrationAddress},
+            </if>
+            <if test="title.phoneNumber != null and title.phoneNumber != ''">
+                phone_number = #{title.phoneNumber},
+            </if>
+            <if test="title.registeredCapital != null and title.registeredCapital != ''">
+                registered_capital = #{title.registeredCapital},
+            </if>
+            <if test="title.companySize != null and title.companySize != ''">
+                company_size = #{title.companySize},
+            </if>
+            <if test="title.registrationNumber != null and title.registrationNumber != ''">
+                registration_number = #{title.registrationNumber},
+            </if>
+            <if test="title.province != null and title.province != ''">
+                province = #{title.province},
+            </if>
+            <if test="title.city != null and title.city != ''">
+                city = #{title.city},
+            </if>
+            <if test="title.scale != null and title.scale != ''">
+                scale = #{title.scale},
+            </if>
+            <if test="title.industry != null and title.industry != ''">
+                industry = #{title.industry},
+            </if>
+        </set>
+        <where>
+            id = #{title.id}
+        </where>
+    </update>
+
 </mapper>
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,7 +77,8 @@ 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("province", data.getProvince());
+        systemFieldMap.put("city", data.getCity());
         systemFieldMap.put("scale", data.getScale());
         systemFieldMap.put("industry", data.getIndustry());
 
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
diff --git a/backend/crm/src/main/resources/migration/1.6.1/ddl/V1.6.1_1__init.sql b/backend/crm/src/main/resources/migration/1.6.1/ddl/V1.6.1_1__init.sql
diff --git a/backend/crm/src/main/resources/migration/1.6.1/ddl/V1.6.1_2__ga_ddl.sql b/backend/crm/src/main/resources/migration/1.6.1/ddl/V1.6.1_2__ga_ddl.sql
