art: 设备管理-点检-换行

zhangherong

2025-04-25 9b00a4bf526c0f0d06ab5c1d1f80f52c7f384859

art: 设备管理-点检-换行

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java

@@ -197,13 +197,13 @@
            if(order == null) {
                errorMsg.append("工单ID：");
                errorMsg.append(workTaskDataVo.getDataId());
                errorMsg.append(",不存在或已被删除!\r\n");
                errorMsg.append(",不存在或已被删除!\n");
                continue;
            }
            if(!InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus())) {
                errorMsg.append("工单号：");
                errorMsg.append(order.getOrderNum());
                errorMsg.append(",状态无法批量审批!\r\n");
                errorMsg.append(",状态无法批量审批!\n");
                continue;
            }
            List<EamInspectionOrderDetail> tableDetailList = eamInspectionOrderDetailService.queryListByOrderId(order.getId());
@@ -223,7 +223,7 @@
                if(result == null) {
                    errorMsg.append("工单号：");
                    errorMsg.append(order.getOrderNum());
                    errorMsg.append(",审批失败!\r\n");
                    errorMsg.append(",审批失败!\n");
                    continue;
                }
                n++;
@@ -232,12 +232,12 @@
                errorMsg.append("工单号：");
                errorMsg.append(order.getOrderNum());
                errorMsg.append(",审批失败,错误原因:");
                errorMsg.append(e.getMessage() + "\r\n");
                errorMsg.append(e.getMessage() + "\n");
            }

        }
        if(n > 0) {
            String message = "成功审批通过" + n + "条记录！\r\n" + errorMsg;
            String message = "成功审批通过" + n + "条记录！\n" + errorMsg;
            return Result.OK(message);
        }
        return Result.error(errorMsg.toString());

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java

@@ -314,7 +314,7 @@
            if (order == null) {
                errorMsg.append("工单ID：");
                errorMsg.append(workTaskDataVo.getDataId());
                errorMsg.append(",不存在或已被删除!\r\n");
                errorMsg.append(",不存在或已被删除!\n");
                continue;
            }
            if (!(WeekMaintenanceStatusEnum.WAIT_CONFIRM.name().equals(order.getMaintenanceStatus())
@@ -322,7 +322,7 @@
                    || WeekMaintenanceStatusEnum.WAIT_FINAL_ACCEPTANCE.name().equals(order.getMaintenanceStatus()))) {
                errorMsg.append("工单号：");
                errorMsg.append(order.getOrderNum());
                errorMsg.append(",状态无法批量审批!\r\n");
                errorMsg.append(",状态无法批量审批!\n");
                continue;
            }
            List<EamWeekMaintenanceOrderDetail> tableDetailList = weekMaintenanceOrderDetailService.queryListByOrderId(order.getId());
@@ -350,7 +350,7 @@
                if (result == null) {
                    errorMsg.append("工单号：");
                    errorMsg.append(order.getOrderNum());
                    errorMsg.append(",审批失败!\r\n");
                    errorMsg.append(",审批失败!\n");
                    continue;
                }
                n++;
@@ -359,12 +359,12 @@
                errorMsg.append("工单号：");
                errorMsg.append(order.getOrderNum());
                errorMsg.append(",审批失败,错误原因:");
                errorMsg.append(e.getMessage() + "\r\n");
                errorMsg.append(e.getMessage() + "\n");
            }

        }
        if (n > 0) {
            String message = "成功审批通过" + n + "条记录！\r\n" + errorMsg;
            String message = "成功审批通过" + n + "条记录！\n" + errorMsg;
            return Result.OK(message);
        }
        return Result.error(errorMsg.toString());