aps-车间作业跟踪导入

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -2797,19 +2797,11 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 needUpdate.setPlanenddate(DateUtil.offsetMinute(workShopExportVo.getPlanstartdate(), workTime));
             }
         }
+        JSONObject res = new JSONObject();
         if (!errorMessageList.isEmpty()) {
-            // 设置响应头
-            response.setContentType("text/plain");
-            response.setHeader("Content-Disposition", "attachment; filename=\"车间作业跟踪导入错误日志" + DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss") + ".txt\"");
-            response.setCharacterEncoding("utf-8");
-
-            // 生成内容并写入响应
-            try (PrintWriter out = response.getWriter()) {
-                for (String error : errorMessageList) {
-                    out.println(error);
-                }
-            }
-            return R.error("数据错误，请下载错误日志查看！");
+            res.put("isSuccess", false);
+            res.put("errorMessage", String.join("\n\r", errorMessageList));
+            return R.ok(res);
         } else {
             List<ApsProcessOperationProcessEquDo> allNeedUpdateList = new LinkedList<>();
             for (String key : resMap.keySet()) {
@@ -2869,7 +2861,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 transactionManager.rollback(status);
                 throw e;
             }
-            return R.ok("导入成功！");
+            res.put("isSuccess", true);
+            return R.ok(res);
         }
     }
 }