修复历史项目导入解环与流水查询SQL

ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/event/CcdiProjectHistoryImportSubmittedEvent.java

@@ -0,0 +1,38 @@
+package com.ruoyi.ccdi.project.domain.event;
+
+import com.ruoyi.ccdi.project.domain.dto.CcdiProjectImportHistoryDTO;
+
+/**
+ * 历史项目导入提交事件
+ */
+public class CcdiProjectHistoryImportSubmittedEvent {
+
+    private final Long targetProjectId;
+    private final Integer targetLsfxProjectId;
+    private final CcdiProjectImportHistoryDTO dto;
+    private final String operator;
+
+    public CcdiProjectHistoryImportSubmittedEvent(Long targetProjectId, Integer targetLsfxProjectId,
+                                                  CcdiProjectImportHistoryDTO dto, String operator) {
+        this.targetProjectId = targetProjectId;
+        this.targetLsfxProjectId = targetLsfxProjectId;
+        this.dto = dto;
+        this.operator = operator;
+    }
+
+    public Long getTargetProjectId() {
+        return targetProjectId;
+    }
+
+    public Integer getTargetLsfxProjectId() {
+        return targetLsfxProjectId;
+    }
+
+    public CcdiProjectImportHistoryDTO getDto() {
+        return dto;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+}

ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectHistoryImportEventListener.java

@@ -0,0 +1,27 @@
+package com.ruoyi.ccdi.project.service.impl;
+
+import com.ruoyi.ccdi.project.domain.event.CcdiProjectHistoryImportSubmittedEvent;
+import com.ruoyi.ccdi.project.service.ICcdiProjectHistoryImportService;
+import jakarta.annotation.Resource;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * 历史项目导入事件监听器
+ */
+@Component
+public class CcdiProjectHistoryImportEventListener {
+
+    @Resource
+    private ICcdiProjectHistoryImportService historyImportService;
+
+    @EventListener
+    public void onSubmitted(CcdiProjectHistoryImportSubmittedEvent event) {
+        historyImportService.submitImport(
+            event.getTargetProjectId(),
+            event.getTargetLsfxProjectId(),
+            event.getDto(),
+            event.getOperator()
+        );
+    }
+}

ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiProjectServiceImpl.java

@@ -7,11 +7,11 @@ import com.ruoyi.ccdi.project.domain.CcdiProject;
 import com.ruoyi.ccdi.project.domain.dto.CcdiProjectImportHistoryDTO;
 import com.ruoyi.ccdi.project.domain.dto.CcdiProjectQueryDTO;
 import com.ruoyi.ccdi.project.domain.dto.CcdiProjectSaveDTO;
+import com.ruoyi.ccdi.project.domain.event.CcdiProjectHistoryImportSubmittedEvent;
 import com.ruoyi.ccdi.project.domain.vo.CcdiProjectHistoryListItemVO;
 import com.ruoyi.ccdi.project.domain.vo.CcdiProjectStatusCountsVO;
 import com.ruoyi.ccdi.project.domain.vo.CcdiProjectVO;
 import com.ruoyi.ccdi.project.mapper.CcdiProjectMapper;
-import com.ruoyi.ccdi.project.service.ICcdiProjectHistoryImportService;
 import com.ruoyi.ccdi.project.service.ICcdiProjectService;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.lsfx.client.LsfxAnalysisClient;
@@ -20,6 +20,7 @@ import com.ruoyi.lsfx.domain.response.GetTokenResponse;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -46,7 +47,7 @@ public class CcdiProjectServiceImpl implements ICcdiProjectService {
     private LsfxAnalysisClient lsfxAnalysisClient;
 
     @Resource
-    private ICcdiProjectHistoryImportService historyImportService;
+    private ApplicationEventPublisher applicationEventPublisher;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -139,7 +140,9 @@ public class CcdiProjectServiceImpl implements ICcdiProjectService {
         TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
             @Override
             public void afterCommit() {
-                historyImportService.submitImport(project.getProjectId(), project.getLsfxProjectId(), dto, operator);
+                applicationEventPublisher.publishEvent(
+                    new CcdiProjectHistoryImportSubmittedEvent(project.getProjectId(), project.getLsfxProjectId(), dto, operator)
+                );
             }
         });
         return project;

ccdi-project/src/main/resources/mapper/ccdi/project/CcdiBankStatementMapper.xml

@@ -49,16 +49,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCcdiBankStatementVo">
-        select bank_statement_id, project_id, LE_ID, ACCOUNT_ID, group_id,
-               LE_ACCOUNT_NAME, LE_ACCOUNT_NO, ACCOUNTING_DATE_ID, ACCOUNTING_DATE,
-               TRX_DATE, CURRENCY, AMOUNT_DR, AMOUNT_CR, AMOUNT_BALANCE,
-               CASH_TYPE, CUSTOMER_LE_ID, CUSTOMER_ACCOUNT_NAME, CUSTOMER_ACCOUNT_NO,
-               customer_bank, customer_reference, customer_cert_no, customer_social_credit_code, USER_MEMO, BANK_COMMENTS,
-               BANK_TRX_NUMBER, BANK, TRX_FLAG, TRX_TYPE, EXCEPTION_TYPE,
-               internal_flag, batch_id, batch_sequence, CREATE_DATE, created_by,
-               meta_json, no_balance, begin_balance, end_balance,
-               override_bs_id, payment_method, cret_no
-        from ccdi_bank_statement
+        bank_statement_id, project_id, LE_ID, ACCOUNT_ID, group_id,
+        LE_ACCOUNT_NAME, LE_ACCOUNT_NO, ACCOUNTING_DATE_ID, ACCOUNTING_DATE,
+        TRX_DATE, CURRENCY, AMOUNT_DR, AMOUNT_CR, AMOUNT_BALANCE,
+        CASH_TYPE, CUSTOMER_LE_ID, CUSTOMER_ACCOUNT_NAME, CUSTOMER_ACCOUNT_NO,
+        customer_bank, customer_reference, customer_cert_no, customer_social_credit_code, USER_MEMO, BANK_COMMENTS,
+        BANK_TRX_NUMBER, BANK, TRX_FLAG, TRX_TYPE, EXCEPTION_TYPE,
+        internal_flag, batch_id, batch_sequence, CREATE_DATE, created_by,
+        meta_json, no_balance, begin_balance, end_balance,
+        override_bs_id, payment_method, cret_no
     </sql>
 
     <resultMap id="CcdiBankStatementListVOResultMap" type="com.ruoyi.ccdi.project.domain.vo.CcdiBankStatementListVO">
@@ -304,8 +303,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCcdiBankStatementVo"/>
         FROM ccdi_bank_statement bs
         <where>
-            bs.project_id = #{projectId}
-            AND bs.batch_id = #{batchId}
+            (bs.project_id = #{projectId})
+            AND (bs.batch_id = #{batchId})
             <if test="startDate != null and startDate != ''">
                 AND (<include refid="parsedTrxDateExpr"/>) <![CDATA[ >= ]]>
                 CASE