From 95c301090d0a582dd9f43391d72d8c8b2cea9ee9 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期五, 06 八月 2021 11:54:21 +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 2a0e1dd..102e5b4 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,t.create_time createTime
+        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