zhangherong
2025-04-25 cf9b6f3763fdee539d9d9919b148394d8b08ec20
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
@@ -11,7 +11,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
@@ -314,7 +313,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,12 +321,13 @@
                    || 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());
            try {
                BeanUtils.copyProperties(orderRequest, order);
                orderRequest.setId(order.getId());
                orderRequest.setEquipmentId(order.getEquipmentId());
                //审批信息
                if (WeekMaintenanceStatusEnum.WAIT_CONFIRM.name().equals(order.getMaintenanceStatus())) {
                    orderRequest.setConfirmComment(request.getConfirmComment());
@@ -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());