From daf9ff33f0a36c9037af70f574697d80174915f8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 06 八月 2024 11:54:23 +0800
Subject: [PATCH] 生命周期所有接口上传（待联调）
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
index febe978..58a4810 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java
@@ -23,6 +23,7 @@
import com.vci.starter.poi.constant.ExcelLangCodeConstant;
import com.vci.starter.poi.util.ExcelUtil;
import com.vci.starter.web.annotation.log.VciUnLog;
+import com.vci.starter.web.enumpck.ResultCodeEnum;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -443,7 +444,9 @@
returnData.put("btmCheckMap",btmCheckMap);
List<Map> list = new ArrayList<>();
list.add(returnData);
- return BaseResult.dataList(500,list,"闇�瑕佽繘琛屽垪鐨勪慨澶嶏紒锛�");
+ BaseResult<List<Map>> listBaseResult = BaseResult.dataList(200, list, "闇�瑕佽繘琛屽垪鐨勪慨澶嶏紒锛�");
+ listBaseResult.setSuccess(false);
+ return listBaseResult;
}
}
@@ -559,7 +562,7 @@
ExcelUtil.writeDataToFile(excelPath, excelOption);
//瀵煎嚭灞炴��
String attrPath = attributeService.exportAttributes("attr",
- String.valueOf(attributes.stream().collect(Collectors.joining(","))));
+ String.valueOf(attributes.stream().collect(Collectors.joining(","))),true);
//绉诲姩灞炴�у埌閾炬帴绫诲瀷鏂囦欢澶归噷闈㈠幓
FileUtil.move(new File(attrPath), new File(defaultTempFolder),true);
FileUtil.del(attrPath.substring(0,attrPath.lastIndexOf("\\")));
--
Gitblit v1.9.3