feat: 修改返回格式

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -3325,7 +3325,6 @@ public class WmScorePackageController {
 
 		return R.ok();
 	}
-
 	/**
 	 * 批量导入积分包
 	 *
@@ -3337,7 +3336,7 @@ public class WmScorePackageController {
 	@Transactional(rollbackFor = Exception.class)
 	@PostMapping(value = "/batch")
 	public R<?> batchCreatePackage(@RequestExcel(fileName = "excel", ignoreEmptyRow = true) List<BatchPackageExcelModel> batchPackageExcelModels,
-											  @RequestPart(value = "history") WmScorePackage scorePackage) {
+								   @RequestPart(value = "history") WmScorePackage scorePackage) {
 
 		log.warn("==========================================批量导入积分包：开始=====================================================");
 
@@ -3368,7 +3367,21 @@ public class WmScorePackageController {
 
 		// 存在错误全表打回
 		if (!errorMap.isEmpty()) {
-			return R.failed(errorMap.asMap());
+
+			List<Map<String, Object>> resultList = new ArrayList<>(errorMap.size());
+			Map<String, Collection<Integer>> asMap = errorMap.asMap();
+
+			for (Map.Entry<String, Collection<Integer>> entry : asMap.entrySet()) {
+
+				Map<String, Object> m = new HashMap<>(2);
+
+				m.put("reason", entry.getKey());
+
+				m.put("line", entry.getValue());
+				resultList.add(m);
+			}
+
+			return R.failed(resultList);
 		}
 
 		for (BatchPackageExcelModel model : batchPackageExcelModels) {
@@ -3480,4 +3493,5 @@ public class WmScorePackageController {
 	}
 
 
+
 }