java110 5 年 前
コミット
0893081331

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/assetImportLog/AssetImportLogDto.java

@@ -22,6 +22,7 @@ public class AssetImportLogDto extends PageDto implements Serializable {
     public static final String LOG_TYPE_HISTORY_FEE_IMPORT = "2002";
     public static final String LOG_TYPE_HISTORY_FEE_IMPORT = "2002";
 
 
     private String logType;
     private String logType;
+    private String logTypeName;
     private Long successCount;
     private Long successCount;
     private String logId;
     private String logId;
     private String remark;
     private String remark;
@@ -112,4 +113,12 @@ public class AssetImportLogDto extends PageDto implements Serializable {
     public void setAssetImportLogDetailDtos(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
     public void setAssetImportLogDetailDtos(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
         this.assetImportLogDetailDtos = assetImportLogDetailDtos;
         this.assetImportLogDetailDtos = assetImportLogDetailDtos;
     }
     }
+
+    public String getLogTypeName() {
+        return logTypeName;
+    }
+
+    public void setLogTypeName(String logTypeName) {
+        this.logTypeName = logTypeName;
+    }
 }
 }

+ 2 - 1
java110-db/src/main/resources/mapper/common/AssetImportLogServiceDaoImplMapper.xml

@@ -19,8 +19,9 @@
     <select id="getAssetImportLogInfo" parameterType="Map" resultType="Map">
     <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.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
         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
         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
         where 1 =1
         <if test="logType !=null and logType != ''">
         <if test="logType !=null and logType != ''">
             and t.log_type= #{logType}
             and t.log_type= #{logType}