优化导入代码开发完成

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

@@ -18,10 +18,24 @@ import java.util.List;
 public class AssetImportLogDto extends PageDto implements Serializable {
 
     //1001 资产导入 2002 缴费历史导入
-    public static final String LOG_TYPE_ASSET_IMPORT = "1001";
+
+    /**
+     * 1001	楼栋单元
+     * 2002	缴费历史
+     * 3003	业主信息
+     * 4004	房屋信息
+     * 5005	费用信息
+     * 6006	车位车辆
+     */
+    public static final String LOG_TYPE_FLOOR_UNIT_IMPORT = "1001";
     public static final String LOG_TYPE_HISTORY_FEE_IMPORT = "2002";
+    public static final String LOG_TYPE_OWENR_IMPORT = "3003";
+    public static final String LOG_TYPE_ROOM_IMPORT = "4004";
+    public static final String LOG_TYPE_FEE_IMPORT = "5005";
+    public static final String LOG_TYPE_AREA_PARKING_IMPORT = "6006";
 
     private String logType;
+    private String logTypeName;
     private Long successCount;
     private String logId;
     private String remark;
@@ -112,4 +126,12 @@ public class AssetImportLogDto extends PageDto implements Serializable {
     public void setAssetImportLogDetailDtos(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
         this.assetImportLogDetailDtos = assetImportLogDetailDtos;
     }
+
+    public String getLogTypeName() {
+        return logTypeName;
+    }
+
+    public void setLogTypeName(String logTypeName) {
+        this.logTypeName = logTypeName;
+    }
 }

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}

service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -159,7 +159,7 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
         assetImportLogDto.setSuccessCount(0L);
         assetImportLogDto.setErrorCount(0L);
         assetImportLogDto.setCommunityId(result.getCommunityId());
-        assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+        assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_FEE_IMPORT);
         List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
         assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
         long successCount = 0L;
@@ -239,7 +239,7 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
         assetImportLogDto.setSuccessCount(0L);
         assetImportLogDto.setErrorCount(0L);
         assetImportLogDto.setCommunityId(result.getCommunityId());
-        assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+        assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_AREA_PARKING_IMPORT);
         List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
         assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
         long successCount = 0L;
@@ -426,7 +426,7 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
         assetImportLogDto.setSuccessCount(0L);
         assetImportLogDto.setErrorCount(0L);
         assetImportLogDto.setCommunityId(result.getCommunityId());
-        assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+        assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_ROOM_IMPORT);
         List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
         assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
         long successCount = 0L;
@@ -731,7 +731,7 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
         assetImportLogDto.setSuccessCount(0L);
         assetImportLogDto.setErrorCount(0L);
         assetImportLogDto.setCommunityId(result.getCommunityId());
-        assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+        assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_OWENR_IMPORT);
         List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
         assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
         long successCount = 0L;
@@ -820,7 +820,7 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
         assetImportLogDto.setSuccessCount(0L);
         assetImportLogDto.setErrorCount(0L);
         assetImportLogDto.setCommunityId(result.getCommunityId());
-        assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+        assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_FLOOR_UNIT_IMPORT);
         List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
         assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
         long successCount = 0L;