fix: invoice export invoice type null

--bug=1065648@tapd-34675357 --user=陈建星 【发票记录】导出开票类型为空 https://www.tapd.cn/34675357/s/1830462

Author: AgAngle

backend/crm/src/main/java/cn/cordys/common/service/BaseExportService.java

@@ -20,6 +20,7 @@
 import cn.cordys.crm.system.constants.ExportConstants;
 import cn.cordys.crm.system.domain.ExportTask;
 import cn.cordys.crm.system.dto.field.base.BaseField;
+import cn.cordys.crm.system.dto.field.base.OptionProp;
 import cn.cordys.crm.system.dto.field.base.SubField;
 import cn.cordys.crm.system.dto.response.ModuleFormConfigDTO;
 import cn.cordys.crm.system.excel.domain.MergeResult;
@@ -681,4 +682,13 @@ public void exportCustomerData(ExportTask exportTask, ExportDTO exportDTO) throw
         //更新状态
         exportTaskService.update(exportTask.getId(), ExportConstants.ExportStatus.SUCCESS.toString(), exportDTO.getUserId());
     }
+
+    protected String getOptionLabel(String value, List<OptionProp> options) {
+        for (OptionProp option : options) {
+            if (Strings.CS.equals(option.getValue(), value)) {
+                return option.getLabel();
+            }
+        }
+        return null;
+    }
 }

backend/crm/src/main/java/cn/cordys/crm/contract/mapper/ExtContractInvoiceMapper.xml

@@ -94,6 +94,7 @@
         ci.tax_rate,
         ci.`owner`,
         ci.business_title_id,
+        ci.approval_status,
         ci.create_user,
         ci.create_time,
         ci.update_user,

backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractInvoiceExportService.java

@@ -1,5 +1,6 @@
 package cn.cordys.crm.contract.service;
 
+import cn.cordys.common.constants.BusinessModuleField;
 import cn.cordys.common.constants.FormKey;
 import cn.cordys.common.dto.ExportDTO;
 import cn.cordys.common.dto.ExportHeadDTO;
@@ -9,11 +10,13 @@
 import cn.cordys.crm.contract.dto.request.ContractInvoicePageRequest;
 import cn.cordys.crm.contract.dto.response.ContractInvoiceListResponse;
 import cn.cordys.crm.contract.mapper.ExtContractInvoiceMapper;
+import cn.cordys.crm.system.dto.field.SelectField;
 import cn.cordys.crm.system.dto.field.base.BaseField;
 import cn.cordys.registry.ExportThreadRegistry;
 import com.github.pagehelper.PageHelper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.Strings;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -61,16 +64,17 @@ public List<List<Object>> getExportData(String taskId, ExportDTO exportDTO) thro
         return data;
     }
 
-    private List<Object> buildData(List<ExportHeadDTO> headList, ContractInvoiceListResponse data, Map<String, BaseField> fieldConfigMap) {
+    private List<Object> buildData(List<ExportHeadDTO> headList, ContractInvoiceListResponse data,
+                                   Map<String, BaseField> fieldConfigMap) {
         //固定字段map
-        LinkedHashMap<String, Object> systemFiledMap = getSystemFieldMap(data);
+        LinkedHashMap<String, Object> systemFiledMap = getSystemFieldMap(data, fieldConfigMap);
         //自定义字段map
         Map<String, Object> moduleFieldMap = getFieldIdValueMap(data.getModuleFields());
         //处理数据转换
         return transModuleFieldValue(headList, systemFiledMap, moduleFieldMap, new ArrayList<>(), fieldConfigMap);
     }
 
-    public LinkedHashMap<String, Object> getSystemFieldMap(ContractInvoiceListResponse data) {
+    public LinkedHashMap<String, Object> getSystemFieldMap(ContractInvoiceListResponse data, Map<String, BaseField> fieldConfigMap) {
         LinkedHashMap<String, Object> systemFiledMap = new LinkedHashMap<>();
         systemFiledMap.put("contractId", data.getContractName());
         systemFiledMap.put("owner", data.getOwnerName());
@@ -81,6 +85,14 @@ public LinkedHashMap<String, Object> getSystemFieldMap(ContractInvoiceListRespon
         systemFiledMap.put("businessTitleId", data.getBusinessTitleId());
         systemFiledMap.put("approvalStatus", data.getApprovalStatus() == null ? null : Translator.get("contract.approval_status." + data.getApprovalStatus().toLowerCase()));
 
+        for (BaseField field : fieldConfigMap.values()) {
+            if (Strings.CS.equals(BusinessModuleField.INVOICE_INVOICE_TYPE.getBusinessKey(), field.getBusinessKey())
+                && field instanceof SelectField invoiceTypeField) {
+                String invoiceTypeName = getOptionLabel(data.getInvoiceType(), invoiceTypeField.getOptions());
+                systemFiledMap.put("invoiceType", invoiceTypeName);
+            }
+        }
+
         systemFiledMap.put("createUser", data.getCreateUserName());
         systemFiledMap.put("createTime", TimeUtils.getDateTimeStr(data.getCreateTime()));
         systemFiledMap.put("updateUser", data.getUpdateUserName());