diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiBankStatementDetailVO.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiBankStatementDetailVO.java index 838202f..0bbcd44 100644 --- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiBankStatementDetailVO.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/domain/vo/CcdiBankStatementDetailVO.java @@ -90,4 +90,10 @@ public class CcdiBankStatementDetailVO { /** 创建时间 */ private Date createDate; + + /** 原始文件名 */ + private String originalFileName; + + /** 原始文件上传时间 */ + private Date uploadTime; } diff --git a/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiBankStatementMapper.xml b/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiBankStatementMapper.xml index 1c08370..cc7ae5f 100644 --- a/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiBankStatementMapper.xml +++ b/ccdi-project/src/main/resources/mapper/ccdi/project/CcdiBankStatementMapper.xml @@ -98,6 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/ccdi-project/src/test/java/com/ruoyi/ccdi/project/mapper/CcdiBankStatementMapperXmlTest.java b/ccdi-project/src/test/java/com/ruoyi/ccdi/project/mapper/CcdiBankStatementMapperXmlTest.java index dca1f23..f1ba30e 100644 --- a/ccdi-project/src/test/java/com/ruoyi/ccdi/project/mapper/CcdiBankStatementMapperXmlTest.java +++ b/ccdi-project/src/test/java/com/ruoyi/ccdi/project/mapper/CcdiBankStatementMapperXmlTest.java @@ -115,6 +115,20 @@ class CcdiBankStatementMapperXmlTest { assertTrue(sql.contains("END ) <= ?"), sql); } + @Test + void selectStatementDetailById_shouldJoinUploadRecordForOriginalFileMetadata() throws Exception { + try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(RESOURCE)) { + String xml = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); + + assertTrue( + xml.contains("LEFT JOIN ccdi_file_upload_record fur ON fur.log_id = bs.batch_id AND fur.project_id = bs.project_id"), + xml + ); + assertTrue(xml.contains("fur.file_name AS originalFileName"), xml); + assertTrue(xml.contains("fur.upload_time AS uploadTime"), xml); + } + } + private MappedStatement loadMappedStatement(String statementId) throws Exception { Configuration configuration = new Configuration(); configuration.setEnvironment(new Environment("test", new JdbcTransactionFactory(), new NoOpDataSource())); diff --git a/ruoyi-ui/src/views/ccdiProject/components/ProjectTable.vue b/ruoyi-ui/src/views/ccdiProject/components/ProjectTable.vue index ac682e2..e8fe268 100644 --- a/ruoyi-ui/src/views/ccdiProject/components/ProjectTable.vue +++ b/ruoyi-ui/src/views/ccdiProject/components/ProjectTable.vue @@ -5,7 +5,6 @@ :data="dataList" style="width: 100%" > -
{{ scope.row.projectName }}
-
{{ scope.row.description || '暂无描述' }}
+
{{ scope.row.description || "暂无描述" }}
- - -
- +
- -
-
-
- 风险人数统计 +
+
风险人数统计
+
+ ● 高风险: + {{ scope.row.highRiskCount }} 人
-
- ● 高风险: - {{ scope.row.highRiskCount }} 人 +
+ ● 中风险: + {{ scope.row.mediumRiskCount }} 人
-
- ● 中风险: - {{ scope.row.mediumRiskCount }} 人 -
-
- ● 低风险: - {{ scope.row.lowRiskCount }} 人 +
+ ● 低风险: + {{ scope.row.lowRiskCount }} 人
- + {{ scope.row.highRiskCount + scope.row.mediumRiskCount + scope.row.lowRiskCount }}
@@ -98,7 +90,6 @@ - -
diff --git a/ruoyi-ui/src/views/ccdiProject/components/detail/UploadData.vue b/ruoyi-ui/src/views/ccdiProject/components/detail/UploadData.vue index e954dec..fa0b791 100644 --- a/ruoyi-ui/src/views/ccdiProject/components/detail/UploadData.vue +++ b/ruoyi-ui/src/views/ccdiProject/components/detail/UploadData.vue @@ -58,7 +58,7 @@ 刷新
- +