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/AssetImportLogDetailServiceDaoImplMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/common/AssetImportLogDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/AssetImportLogDetailServiceDaoImplMapper.xml
index 528ca2f..3be7c62 100644
--- a/java110-db/src/main/resources/mapper/common/AssetImportLogDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/AssetImportLogDetailServiceDaoImplMapper.xml
@@ -26,8 +26,11 @@
     <!-- 鏌ヨ鎵归噺鎿嶄綔鏃ュ織璇︽儏淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getAssetImportLogDetailInfo" parameterType="Map" resultType="Map">
         select t.detail_id,t.detail_id detailId,t.log_id,t.log_id logId,t.status_cd,t.status_cd
-        statusCd,t.state,t.content,t.content,t.community_id,t.community_id communityId,t.message
+        statusCd,t.state,t.content,t.content,t.community_id,t.community_id communityId,t.message,
+        t.create_time createTime,td1.name stateName
         from asset_import_log_detail t
+        LEFT JOIN t_dict td1 on t.state = td1.status_cd and td1.table_name = 'asset_import_log' and td1.table_columns =
+        'state'
         where 1 =1
         <if test="detailId !=null and detailId != ''">
             and t.detail_id= #{detailId}

--
Gitblit v1.8.0