java110 лет назад: 2
Родитель
Сommit
8ef0a877c8

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

@@ -8,7 +8,7 @@
     <!-- 保存批量操作日志详情信息 add by wuxw 2018-07-03 -->
     <insert id="saveAssetImportLogDetailInfo" parameterType="Map">
         insert into asset_import_log_detail(
-        detail_id,log_id,state,obj_name,community_id,message
+        detail_id,log_id,state,content,community_id,message
         ) values (
         #{detailId},#{logId},#{state},#{content},#{communityId},#{message}
         )
@@ -26,7 +26,7 @@
     <!-- 查询批量操作日志详情信息 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.obj_name objName,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
         from asset_import_log_detail t
         where 1 =1
         <if test="detailId !=null and detailId != ''">

+ 1 - 1
service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -154,7 +154,7 @@ public class AssetImportSMOImpl extends DefaultAbstractComponentSMO implements I
         // todo 调用 导入队列开始导入
         flag = userImportDataV1InnerServiceSMOImpl.importExcelData(assetImportLogPo);
         if (flag > 0) {
-            return ResultVo.success();
+            return ResultVo.createResponseEntity(assetImportLogPo);
         }
         return ResultVo.error("导入失败");
     }

+ 1 - 1
springboot/src/main/java/com/java110/boot/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -154,7 +154,7 @@ public class AssetImportSMOImpl extends DefaultAbstractComponentSMO implements I
         // todo 调用 导入队列开始导入
         flag = userImportDataV1InnerServiceSMOImpl.importExcelData(assetImportLogPo);
         if (flag > 0) {
-            return ResultVo.success();
+            return ResultVo.createResponseEntity(assetImportLogPo);
         }
         return ResultVo.error("导入失败");
     }