From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
index d36908d..b82618a 100644
--- a/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
@@ -17,12 +17,13 @@
<!-- 鏌ヨ鎵归噺鎿嶄綔鏃ュ織淇℃伅 add by wuxw 2018-07-03 -->
<select id="getAssetImportLogInfo" parameterType="Map" resultType="Map">
- select t.log_type,t.log_type logType,t.success_count,t.success_count successCount,t.log_id,t.log_id
+ select t.log_type,t.log_type logType,t.log_id,t.log_id
logId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
- communityId,t.error_count,t.error_count errorCount,t.create_time createTime,t.state,td.`name`
+ communityId,t.create_time createTime,t.state,td.`name`
logTypeName,td1.name stateName,
(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) 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
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'
--
Gitblit v1.8.0