--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/copyright/CopyrightController.java

@@ -16,10 +16,7 @@ import com.zrqx.resource.bg.client.newbook.NewBookClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
@@ -366,9 +363,10 @@ public class CopyrightController {
 		return CallBack.success(newToken);
 	}
 
-	@ApiOperation(value = "导入合同")
+	@ApiOperation(value = "导入合同,key:0成功,1:失败")
 	@PostMapping(value = ResourceRequestPath.IMPORT, produces = "application/json;charset=UTF-8")
-	public CallBack<String> importContract(@RequestParam("file") MultipartFile file) throws Exception {
+	public CallBack<Map<Integer,String>> importContract(@RequestParam("file") MultipartFile file) throws Exception {
+		Map<Integer,String> map = new HashMap<>();
 		Copyright copyright = new Copyright();
 		StringBuffer sb = new StringBuffer();
 		sb.append("第 ");
@@ -399,16 +397,19 @@ public class CopyrightController {
 		if (num > 0) {
 			sb.substring(1);
 			sb.append(" 行添加失败，请修改成正确的形式,成功添加" + success + "行");
+			map.put(1,sb.toString());
 		}
 		if (num == 0) {
 			sb.setLength(0);
 			if (success == 0){
 				sb.append("导入失败，请检查导入文件是否正确");
+				map.put(1,sb.toString());
 			}else {
 				sb.append("全部添加成功,成功添加" + success + "行");
+				map.put(0,sb.toString());
 			}
 		}
-		return CallBack.success(sb.toString());
+		return CallBack.success(map);
 	}
 
 	//导出