From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四

---
 java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
index efe1763..7b96264 100644
--- a/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
@@ -8,9 +8,9 @@
     <!-- 淇濆瓨鎵归噺鎿嶄綔鏃ュ織淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveAssetImportLogInfo" parameterType="Map">
         insert into asset_import_log(
-        log_type,success_count,log_id,remark,community_id,error_count,user_name
+        log_type,success_count,log_id,remark,community_id,error_count,user_name,import_file_name
         ) values (
-        #{logType},#{successCount},#{logId},#{remark},#{communityId},#{errorCount},#{userName}
+        #{logType},#{successCount},#{logId},#{remark},#{communityId},#{errorCount},#{userName},#{importFileName}
         )
     </insert>
 
@@ -21,14 +21,24 @@
         logId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
         communityId,t.create_time createTime,t.state,td.`name`
         logTypeName,td1.name stateName,t.user_name userName,
-        (select count(1) successCount from asset_import_log_detail a where a.log_id = t.log_id and a.status_cd = '0' and a.state = 'C') successCount,
-        (select count(1) errorCount from asset_import_log_detail a where a.log_id = t.log_id and a.status_cd = '0' and a.state = 'F') errorCount,
-        (select count(1) waitCount from asset_import_log_detail a where a.log_id = t.log_id and a.status_cd = '0' and a.state = 'W') waitCount
+        COALESCE(d.successCount, 0) AS successCount,
+        COALESCE(d.errorCount, 0) AS errorCount,
+        COALESCE(d.waitCount, 0) AS waitCount
         from asset_import_log t
         LEFT JOIN t_dict td on t.log_type = td.status_cd and td.table_name = 'asset_import_log' and td.table_columns =
         'log_type'
         LEFT JOIN t_dict td1 on t.state = td1.status_cd and td1.table_name = 'asset_import_log' and td1.table_columns =
         'state'
+        LEFT JOIN (
+        SELECT
+        log_id,
+        COUNT(CASE WHEN status_cd = '0' AND state = 'C' THEN 1 END) AS successCount,
+        COUNT(CASE WHEN status_cd = '0' AND state = 'F' THEN 1 END) AS errorCount,
+        COUNT(CASE WHEN status_cd = '0' AND state = 'W' THEN 1 END) AS waitCount
+        FROM asset_import_log_detail
+        WHERE status_cd = '0'
+        GROUP BY log_id
+        ) d ON t.log_id = d.log_id
         where 1 =1
         <if test="logType !=null and logType != ''">
             and t.log_type= #{logType}

--
Gitblit v1.8.0