From f1d1ad21cae722ceba4677cc30c133bd8c3b0701 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 14 九月 2021 15:39:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
index 6e31ff5..6d8d8f4 100644
--- a/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
@@ -19,8 +19,9 @@
<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
logId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
- communityId,t.error_count,t.error_count errorCount
+ communityId,t.error_count,t.error_count errorCount,t.create_time createTime,td.`name` logTypeName
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'
where 1 =1
<if test="logType !=null and logType != ''">
and t.log_type= #{logType}
--
Gitblit v1.8.0