feat(adopt): 增加文档类型参数以优化消息转换逻辑- 在 ReceiveMessageCO 中新增 documentType 字段用于区分文档类型

- 修改 AdoptMessageServiceImpl 的 convertMessage 方法，传入 documentType 参数 - 更新 ITaxPipelineBusinessKeywordService 接口方法签名，增加 documentType 参数 - 调整 TaxPipelineBusinessConfigService 实现类中的查询逻辑，根据 documentType 过滤关键词配置 -为 TaxPipelineBusinessKeyword 查询条件添加 documentType 等值匹配规则

feat(adopt): 增加文档类型参数以优化消息转换逻辑- 在 ReceiveMessageCO 中新增 documentType 字段用于区分文档类型
- 修改 AdoptMessageServiceImpl 的 convertMessage 方法，传入 documentType 参数 - 更新 ITaxPipelineBusinessKeywordService 接口方法签名，增加 documentType 参数 - 调整 TaxPipelineBusinessConfigService 实现类中的查询逻辑，根据 documentType 过滤关键词配置 -为 TaxPipelineBusinessKeyword 查询条件添加 documentType 等值匹配规则
zhangmeiyang
1 parent 50e01da1
Showing 4 changed files with 12 additions and 3 deletions
tax-adopt/src/main/java/com/diligrp/tax/adopt/model/ReceiveMessageCO.java
tax-adopt/src/main/java/com/diligrp/tax/adopt/service/impl/AdoptMessageServiceImpl.java
tax-central/src/main/java/com/diligrp/tax/central/service/ITaxPipelineBusinessKeywordService.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/TaxPipelineBusinessConfigService.java
@@ -27,7 +27,15 @@ public class ReceiveMessageCO {
      */
     private String pipelineCode;
+    /**
+     * 业务代码
+     */
     private String businessCode;
+
+    /**
+     * 文档类型
+     */
+    private String documentType;
     /**
      * 消息信息
      */
@@ -32,7 +32,7 @@ public class AdoptMessageServiceImpl implements AdoptMessageService {
     public void convertMessage(ReceiveMessageCO receiveMessageCO) {
         // 查询配置信息
         List<PipelineBusinessKeyword> pipelineBusinessKeywords = taxPipelineBusinessKeywordService.queryByTenantAndPipelineAndBusiness(receiveMessageCO.getGroup(),
-                receiveMessageCO.getEntity(), receiveMessageCO.getPipelineCode(), receiveMessageCO.getBusinessCode());
+                receiveMessageCO.getEntity(), receiveMessageCO.getPipelineCode(), receiveMessageCO.getBusinessCode(), receiveMessageCO.getDocumentType());
         if (CollectionUtils.isEmpty(pipelineBusinessKeywords)) {
             throw new TaxAgentServiceException("未找到配置信息");
         }
@@ -18,5 +18,5 @@ public interface ITaxPipelineBusinessKeywordService {
      * @param businessCode 业务代码
      * @return {@link List }<{@link PipelineBusinessKeyword }>
      */
-    List<PipelineBusinessKeyword> queryByTenantAndPipelineAndBusiness(String group, String entity, String pipelineCode, String businessCode);
+    List<PipelineBusinessKeyword> queryByTenantAndPipelineAndBusiness(String group, String entity, String pipelineCode, String businessCode,String documentType);
 }
@@ -305,7 +305,7 @@ public class TaxPipelineBusinessConfigService implements ITaxPipelineBusinessKey
      * @return {@link List }<{@link PipelineBusinessKeyword }>
      */
     @Override
-    public List<PipelineBusinessKeyword> queryByTenantAndPipelineAndBusiness(String group, String entity, String pipelineCode, String businessCode) {
+    public List<PipelineBusinessKeyword> queryByTenantAndPipelineAndBusiness(String group, String entity, String pipelineCode, String businessCode,String documentType) {
         Long tenantId = taxTenantService.getTenantId(group, entity);
         TaxPipelineVO byTenantIdAndCode = taxPipelineService.getByTenantIdAndCode(tenantId, pipelineCode);
         LambdaQueryWrapper<TaxPipelineBusiness> queryWrapper = new LambdaQueryWrapper<>();
@@ -315,6 +315,7 @@ public class TaxPipelineBusinessConfigService implements ITaxPipelineBusinessKey
         Optional.ofNullable(taxPipelineBusiness).orElseThrow(() -> new TaxAgentServiceException(TaxSystemType.MISSING_BUSINESS_INFORMATION));
         LambdaQueryWrapper<TaxPipelineBusinessKeyword> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TaxPipelineBusinessKeyword::getTaxPipelineBusinessId, taxPipelineBusiness.getId());
+        wrapper.eq(TaxPipelineBusinessKeyword::getDocumentType, documentType);
         return taxPipelineBusinessKeywordRepository.selectList(wrapper).stream().map(item -> {
             PipelineBusinessKeyword pipelineBusinessKeyword = JsonUtils.convertValue(item, PipelineBusinessKeyword.class);
             pipelineBusinessKeyword.setDocumentFieldTypeEnum(DocumentFieldType.from(item.getDocumentFieldType()));