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 | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
index 6d8d8f4..b82618a 100644
--- a/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml
@@ -17,11 +17,18 @@
<!-- 鏌ヨ鎵归噺鎿嶄綔鏃ュ織淇℃伅 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,td.`name` logTypeName
+ 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) 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'
+ 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'
where 1 =1
<if test="logType !=null and logType != ''">
and t.log_type= #{logType}
@@ -43,6 +50,9 @@
</if>
<if test="errorCount !=null and errorCount != ''">
and t.error_count= #{errorCount}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -67,17 +77,19 @@
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
</if>
- <if test="communityId !=null and communityId != ''">
- , t.community_id= #{communityId}
- </if>
<if test="errorCount !=null and errorCount != ''">
, t.error_count= #{errorCount}
+ </if>
+ <if test="state !=null and state != ''">
+ , t.state= #{state}
</if>
where 1=1
<if test="logId !=null and logId != ''">
and t.log_id= #{logId}
</if>
-
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
</update>
<!-- 鏌ヨ鎵归噺鎿嶄綔鏃ュ織鏁伴噺 add by wuxw 2018-07-03 -->
@@ -106,8 +118,20 @@
<if test="errorCount !=null and errorCount != ''">
and t.error_count= #{errorCount}
</if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
</select>
+ <!-- 鏌ヨ瀵煎叆鏃ュ織绫诲瀷 -->
+ <select id="queryAssetImportLogType" parameterType="Map" resultType="Map">
+ select t.type_id typeId,t.log_type logType,t.log_column logColumn,
+ t.log_property logProperty,t.remark,t.create_time createTime
+ from asset_import_log_type t
+ where t.status_cd = '0'
+ and t.log_type = #{logType}
+ order by CAST(t.type_id AS UNSIGNED)
+ </select>
</mapper>
--
Gitblit v1.8.0