wkc/ccdi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复风险仪表盘总人数统计

Browse Source
This commit is contained in:
wkc
2026-03-19 15:57:27 +08:00
parent e305902e7c
commit 199dbb1d9d
4 changed files with 101 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiFileUploadServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.ccdi.project.service.impl;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.ccdi.project.domain.CcdiProject;
import com.ruoyi.ccdi.project.domain.enums.TriggerType;
@@ -235,6 +236,7 @@ public class CcdiFileUploadServiceImpl implements ICcdiFileUploadService {
}
bankStatementMapper.deleteByProjectIdAndBatchId(record.getProjectId(), record.getLogId());
refreshProjectTargetCount(record.getProjectId());
CcdiFileUploadRecord update = new CcdiFileUploadRecord();
update.setId(record.getId());
@@ -853,6 +855,7 @@ public class CcdiFileUploadServiceImpl implements ICcdiFileUploadService {
result.setTotalCount(totalCount == null ? 0 : totalCount);
if (totalCount == null || totalCount <= 0) {
log.warn("【文件上传】无流水数据需要保存: totalCount={}", totalCount);
refreshProjectTargetCount(projectId);
result.setSuccess(true);
return result;
}
@@ -922,6 +925,7 @@ public class CcdiFileUploadServiceImpl implements ICcdiFileUploadService {
log.info("【文件上传】流水入库完成: fetchedCount={}, attemptedCount={}",
totalCount, totalAttempted);
refreshProjectTargetCount(projectId);
result.setSuccess(true);
result.setAttemptedCount(totalAttempted);
return result;
@@ -938,6 +942,24 @@ public class CcdiFileUploadServiceImpl implements ICcdiFileUploadService {
bankStatementMapper.deleteByProjectIdAndBatchId(projectId, logId);
}
private void refreshProjectTargetCount(Long projectId) {
CcdiProject project = projectMapper.selectById(projectId);
if (project == null) {
log.warn("【项目】刷新目标人数时项目不存在: projectId={}", projectId);
return;
}
QueryWrapper<CcdiBankStatement> queryWrapper = new QueryWrapper<>();
queryWrapper.select("DISTINCT TRIM(cret_no)");
queryWrapper.eq("project_id", projectId);
queryWrapper.isNotNull("cret_no");
queryWrapper.apply("TRIM(cret_no) <> ''");
int targetCount = bankStatementMapper.selectObjs(queryWrapper).size();
project.setTargetCount(targetCount);
projectMapper.updateById(project);
}
private void validateDeleteRecord(CcdiFileUploadRecord record) {
if (record == null) {
throw new RuntimeException("上传记录不存在");

31
ccdi-project/src/test/java/com/ruoyi/ccdi/project/service/impl/CcdiFileUploadServiceImplTest.java
View File

@@ -284,6 +284,10 @@ class CcdiFileUploadServiceImplTest {
List<String> events = new ArrayList<>();
AtomicInteger sequence = new AtomicInteger();
captureRecordStatus(events, sequence);
CcdiProject project = new CcdiProject();
project.setProjectId(PROJECT_ID);
when(projectMapper.selectById(PROJECT_ID)).thenReturn(project);
when(bankStatementMapper.selectObjs(any())).thenReturn(List.of("110101199001018888"));
when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any())).thenReturn(buildUploadResponse());
when(lsfxClient.checkParseStatus(LSFX_PROJECT_ID, String.valueOf(LOG_ID)))
@@ -304,6 +308,9 @@ class CcdiFileUploadServiceImplTest {
int successIndex = findEventIndex(events, "record:parsed_success");
assertTrue(fetchIndex >= 0);
assertTrue(successIndex > fetchIndex);
verify(projectMapper).updateById(org.mockito.ArgumentMatchers.<CcdiProject>argThat(item ->
PROJECT_ID.equals(item.getProjectId()) && Integer.valueOf(1).equals(item.getTargetCount())
));
}
@Test
@@ -362,9 +369,13 @@ class CcdiFileUploadServiceImplTest {
record.setLsfxProjectId(LSFX_PROJECT_ID);
record.setLogId(LOG_ID);
record.setFileStatus("parsed_success");
CcdiProject project = new CcdiProject();
project.setProjectId(PROJECT_ID);
when(recordMapper.selectById(RECORD_ID)).thenReturn(record);
when(lsfxClient.deleteFiles(any())).thenReturn(buildDeleteFilesResponse());
when(projectMapper.selectById(PROJECT_ID)).thenReturn(project);
when(bankStatementMapper.selectObjs(any())).thenReturn(List.of("110101199001018888", "110101199001019999"));
String result = service.deleteFileUploadRecord(RECORD_ID, 9527L);
@@ -379,6 +390,9 @@ class CcdiFileUploadServiceImplTest {
verify(recordMapper).updateById(org.mockito.ArgumentMatchers.<CcdiFileUploadRecord>argThat(item ->
RECORD_ID.equals(item.getId()) && "deleted".equals(item.getFileStatus())
));
verify(projectMapper).updateById(org.mockito.ArgumentMatchers.<CcdiProject>argThat(item ->
PROJECT_ID.equals(item.getProjectId()) && Integer.valueOf(2).equals(item.getTargetCount())
));
}
@Test
@@ -544,6 +558,23 @@ class CcdiFileUploadServiceImplTest {
}
}
@Test
void refreshProjectTargetCount_shouldUpdateProjectWithDistinctIdCardCount() {
CcdiProject project = new CcdiProject();
project.setProjectId(PROJECT_ID);
when(projectMapper.selectById(PROJECT_ID)).thenReturn(project);
when(bankStatementMapper.selectObjs(any())).thenReturn(List.of(
"110101199001018888",
"110101199001019999"
));
ReflectionTestUtils.invokeMethod(service, "refreshProjectTargetCount", PROJECT_ID);
verify(projectMapper).updateById(org.mockito.ArgumentMatchers.<CcdiProject>argThat(item ->
PROJECT_ID.equals(item.getProjectId()) && Integer.valueOf(2).equals(item.getTargetCount())
));
}
@Test
void processFileAsync_shouldMarkParsedFailedWhenInsertBatchThrowsUnexpectedSqlError() throws IOException {
List<String> events = new ArrayList<>();